fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use skip instead of fseek 

fseek(SEEK_CUR) doesn't work for nonseekable streams (such
as pipes).

Only do this for skipping past small chunks; don't use it for
skipping past the actual data for non-streamed input.
This commit is contained in:
Martin Storsjo 2014-02-07 14:59:20 +02:00
parent cb19aa7c12
commit 43cb942cd4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wavreader.c
View File

@ -63,6 +63,12 @@ static uint16_t read_int16(struct wav_reader* wr) {
return value; return value;
} }
static void skip(FILE *f, int n) {
int i;
for (i = 0; i < n; i++)
fgetc(f);
}
void* wav_read_open(const char *filename) { void* wav_read_open(const char *filename) {
struct wav_reader* wr = (struct wav_reader*) malloc(sizeof(*wr)); struct wav_reader* wr = (struct wav_reader*) malloc(sizeof(*wr));
long data_pos = 0; long data_pos = 0;
@ -118,7 +124,7 @@ void* wav_read_open(const char *filename) {
wr->byte_rate = read_int32(wr); wr->byte_rate = read_int32(wr);
wr->block_align = read_int16(wr); wr->block_align = read_int16(wr);
wr->bits_per_sample = read_int16(wr); wr->bits_per_sample = read_int16(wr);
fseek(wr->wav, sublength - 16, SEEK_CUR); skip(wr->wav, sublength - 16);
} else if (subtag == TAG('d', 'a', 't', 'a')) { } else if (subtag == TAG('d', 'a', 't', 'a')) {
data_pos = ftell(wr->wav); data_pos = ftell(wr->wav);
wr->data_length = sublength; wr->data_length = sublength;
@ -128,7 +134,7 @@ void* wav_read_open(const char *filename) {
} }
fseek(wr->wav, sublength, SEEK_CUR); fseek(wr->wav, sublength, SEEK_CUR);
} else { } else {
fseek(wr->wav, sublength, SEEK_CUR); skip(wr->wav, sublength);
} }
length -= sublength; length -= sublength;
} }