oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

aac: use fillAacBuffer() instead of manual reading

Browse Source 
Eliminate some duplicated code by using fillAacBuffer().
This commit is contained in:
Max Kellermann 2008-08-26 08:27:11 +02:00
parent 00c47b3c85
commit 9131f9ebfe
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/inputPlugins/aac_plugin.c
View File

@ -179,7 +179,6 @@ static void adtsParse(AacBuffer * b, float *length)
static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length) static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
{ {
size_t fileread; size_t fileread;
size_t bread;
size_t tagsize; size_t tagsize;
if (length) if (length)
@ -194,14 +193,7 @@ static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
b->buffer = xmalloc(FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); b->buffer = xmalloc(FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
memset(b->buffer, 0, FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); memset(b->buffer, 0, FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
bread = readFromInputStream(inStream, b->buffer, 1, fillAacBuffer(b);
FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
b->bytesIntoBuffer = bread;
b->bytesConsumed = 0;
b->fileOffset = 0;
if (bread == 0 && inputStreamAtEOF(inStream))
b->atEof = 1;
tagsize = 0; tagsize = 0;
if (!memcmp(b->buffer, "ID3", 3)) { if (!memcmp(b->buffer, "ID3", 3)) {
@ -220,15 +212,11 @@ static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
adtsParse(b, length); adtsParse(b, length);
seekInputStream(b->inStream, tagsize, SEEK_SET); seekInputStream(b->inStream, tagsize, SEEK_SET);
bread = readFromInputStream(b->inStream, b->buffer, 1, b->bytesIntoBuffer = 0;
FAAD_MIN_STREAMSIZE *
AAC_MAX_CHANNELS);
if (bread == 0 && inputStreamAtEOF(inStream))
b->atEof = 1;
b->bytesIntoBuffer = bread;
b->bytesConsumed = 0; b->bytesConsumed = 0;
b->fileOffset = tagsize; b->fileOffset = tagsize;
fillAacBuffer(b);
} else if (memcmp(b->buffer, "ADIF", 4) == 0) { } else if (memcmp(b->buffer, "ADIF", 4) == 0) {
int bitRate; int bitRate;
int skipSize = (b->buffer[4] & 0x80) ? 9 : 0; int skipSize = (b->buffer[4] & 0x80) ? 9 : 0;