Skip to content

M
mpd
Commit 2a141411 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

aac: simplified fillAacBuffer()

Return instead of putting all the code into a if-closure. That saves one level of indentation.
parent 1d18f008
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 15 deletions
src/inputPlugins/aac_plugin.c
View file @ 2a141411
...@@ -39,9 +39,11 @@ typedef struct { ...@@ -39,9 +39,11 @@ typedef struct {
static void fillAacBuffer(AacBuffer * b) static void fillAacBuffer(AacBuffer * b)
{ {
if (b->bytesConsumed > 0) {
size_t bread; size_t bread;
if (b->bytesConsumed == 0)
return;
if (b->bytesIntoBuffer) { if (b->bytesIntoBuffer) {
memmove((void *)b->buffer, (void *)(b->buffer + memmove((void *)b->buffer, (void *)(b->buffer +
b->bytesConsumed), b->bytesConsumed),
...@@ -61,21 +63,11 @@ static void fillAacBuffer(AacBuffer * b) ...@@ -61,21 +63,11 @@ static void fillAacBuffer(AacBuffer * b)
b->bytesConsumed = 0; b->bytesConsumed = 0;
if (b->bytesIntoBuffer > 3) { if ((b->bytesIntoBuffer > 3 && memcmp(b->buffer, "TAG", 3) == 0) ||
if (memcmp(b->buffer, "TAG", 3) == 0) (b->bytesIntoBuffer > 11 &&
b->bytesIntoBuffer = 0; memcmp(b->buffer, "LYRICSBEGIN", 11) == 0) ||
} (b->bytesIntoBuffer > 8 && memcmp(b->buffer, "APETAGEX", 8) == 0))
if (b->bytesIntoBuffer > 11) {
if (memcmp(b->buffer, "LYRICSBEGIN", 11) == 0) {
b->bytesIntoBuffer = 0;
}
}
if (b->bytesIntoBuffer > 8) {
if (memcmp(b->buffer, "APETAGEX", 8) == 0) {
b->bytesIntoBuffer = 0; b->bytesIntoBuffer = 0;
}
}
}
} }
static void advanceAacBuffer(AacBuffer * b, size_t bytes) static void advanceAacBuffer(AacBuffer * b, size_t bytes)
......
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