aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:11 +0200
committerEric Wong <normalperson@yhbt.net>2008-08-30 18:45:12 -0700
commit20755291951a9cb9e21afba763a80015229e7655 (patch)
treedcc720ab3e0e9d882c791864caa762702bd83942 /src
parent0db89f3e2cc7375273e32f77628ca0583d7a7026 (diff)
downloadmpd-20755291951a9cb9e21afba763a80015229e7655.tar.gz
mpd-20755291951a9cb9e21afba763a80015229e7655.tar.xz
mpd-20755291951a9cb9e21afba763a80015229e7655.zip
aac: use fillAacBuffer() instead of manual reading
Eliminate some duplicated code by using fillAacBuffer().
Diffstat (limited to 'src')
-rw-r--r--src/inputPlugins/aac_plugin.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index f6f731332..e9eccf31a 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -179,7 +179,6 @@ static void adtsParse(AacBuffer * b, float *length)
static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
{
size_t fileread;
- size_t bread;
size_t tagsize;
if (length)
@@ -194,14 +193,7 @@ static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
b->buffer = xmalloc(FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
memset(b->buffer, 0, FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
- bread = readFromInputStream(inStream, b->buffer, 1,
- FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS);
- b->bytesIntoBuffer = bread;
- b->bytesConsumed = 0;
- b->fileOffset = 0;
-
- if (bread == 0 && inputStreamAtEOF(inStream))
- b->atEof = 1;
+ fillAacBuffer(b);
tagsize = 0;
if (!memcmp(b->buffer, "ID3", 3)) {
@@ -220,15 +212,11 @@ static void initAacBuffer(InputStream * inStream, AacBuffer * b, float *length)
adtsParse(b, length);
seekInputStream(b->inStream, tagsize, SEEK_SET);
- bread = readFromInputStream(b->inStream, b->buffer, 1,
- FAAD_MIN_STREAMSIZE *
- AAC_MAX_CHANNELS);
- if (bread == 0 && inputStreamAtEOF(inStream))
- b->atEof = 1;
-
- b->bytesIntoBuffer = bread;
+ b->bytesIntoBuffer = 0;
b->bytesConsumed = 0;
b->fileOffset = tagsize;
+
+ fillAacBuffer(b);
} else if (memcmp(b->buffer, "ADIF", 4) == 0) {
int bitRate;
int skipSize = (b->buffer[4] & 0x80) ? 9 : 0;