am 153de437: am 29a4e283: Merge "We HAVE_LITTLE_ENDIAN."
* commit '153de437c04acc6c4ccb97cf209b12df41191580':
We HAVE_LITTLE_ENDIAN.
diff --git a/audio_utils/include/audio_utils/primitives.h b/audio_utils/include/audio_utils/primitives.h
index bc55191..b93f649 100644
--- a/audio_utils/include/audio_utils/primitives.h
+++ b/audio_utils/include/audio_utils/primitives.h
@@ -277,7 +277,7 @@
* src Source buffer
* count Number of stereo frames to downmix
* The destination and source buffers must be completely separate (non-overlapping).
- * The current implementation truncates the sum rather than dither, but this may change.
+ * The current implementation truncates the mean rather than dither, but this may change.
*/
void downmix_to_mono_i16_from_stereo_i16(int16_t *dst, const int16_t *src, size_t count);
diff --git a/audio_utils/tinysndfile.c b/audio_utils/tinysndfile.c
index 0d9a711..30befc5 100644
--- a/audio_utils/tinysndfile.c
+++ b/audio_utils/tinysndfile.c
@@ -97,6 +97,7 @@
size_t remaining = riffSize - 4;
int hadFmt = 0;
int hadData = 0;
+ long dataTell = 0L;
while (remaining >= 8) {
unsigned char chunk[8];
actual = fread(chunk, sizeof(char), sizeof(chunk), stream);
@@ -198,6 +199,10 @@
}
handle->remaining = chunkSize / handle->bytesPerFrame;
handle->info.frames = handle->remaining;
+ dataTell = ftell(stream);
+ if (chunkSize > 0) {
+ fseek(stream, (long) chunkSize, SEEK_CUR);
+ }
hadData = 1;
} else if (!memcmp(&chunk[0], "fact", 4)) {
// ignore fact
@@ -222,6 +227,7 @@
fprintf(stderr, "missing data\n");
goto close;
}
+ (void) fseek(stream, dataTell, SEEK_SET);
*info = handle->info;
return handle;