Skip to content

F
fdk-aac
Commit e7348e7a authored by Martin Storsjo's avatar Martin Storsjo
Browse files
Options

Support streamed wav files with a 0 bytes data chunk

parent 1652691e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
wavreader.c
View file @ e7348e7a
...@@ -34,6 +34,8 @@ struct wav_reader { ...@@ -34,6 +34,8 @@ struct wav_reader {
int channels; int channels;
int byte_rate; int byte_rate;
int block_align; int block_align;
int streamed;
}; };
static uint32_t read_tag(struct wav_reader* wr) { static uint32_t read_tag(struct wav_reader* wr) {
...@@ -113,6 +115,10 @@ void* wav_read_open(const char *filename) { ...@@ -113,6 +115,10 @@ void* wav_read_open(const char *filename) {
} 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;
if (!wr->data_length) {
wr->streamed = 1;
return wr;
}
fseek(wr->wav, sublength, SEEK_CUR); fseek(wr->wav, sublength, SEEK_CUR);
} else { } else {
fseek(wr->wav, sublength, SEEK_CUR); fseek(wr->wav, sublength, SEEK_CUR);
...@@ -154,7 +160,7 @@ int wav_read_data(void* obj, unsigned char* data, unsigned int length) { ...@@ -154,7 +160,7 @@ int wav_read_data(void* obj, unsigned char* data, unsigned int length) {
int n; int n;
if (wr->wav == NULL) if (wr->wav == NULL)
return -1; return -1;
if (length > wr->data_length) if (length > wr->data_length && !wr->streamed)
length = wr->data_length; length = wr->data_length;
n = fread(data, 1, length, wr->wav); n = fread(data, 1, length, wr->wav);
wr->data_length -= length; wr->data_length -= length;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment