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

removed local variable "eof" because it is unused

Browse Source 
"break" is so much easier than "eof=1; continue;", when "!eof" is the
loop condition.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:06 +02:00
parent ee3bbb5028
commit 4c06624988
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/inputPlugins/aac_plugin.c
View File

@ -289,7 +289,6 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
AudioFormat audio_format; AudioFormat audio_format;
uint32_t sampleRate; uint32_t sampleRate;
unsigned char channels; unsigned char channels;
int eof = 0;
unsigned int sampleCount; unsigned int sampleCount;
char *sampleBuffer; char *sampleBuffer;
size_t sampleBufferLen; size_t sampleBufferLen;
@ -342,13 +341,12 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
advanceAacBuffer(&b, bread); advanceAacBuffer(&b, bread);
while (!eof) { while (1) {
fillAacBuffer(&b); fillAacBuffer(&b);
if (b.bytesIntoBuffer == 0) { if (b.bytesIntoBuffer == 0)
eof = 1;
break; break;
}
#ifdef HAVE_FAAD_BUFLEN_FUNCS #ifdef HAVE_FAAD_BUFLEN_FUNCS
sampleBuffer = faacDecDecode(decoder, &frameInfo, b.buffer, sampleBuffer = faacDecDecode(decoder, &frameInfo, b.buffer,
b.bytesIntoBuffer); b.bytesIntoBuffer);
@ -360,7 +358,6 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
ERROR("error decoding AAC file: %s\n", path); ERROR("error decoding AAC file: %s\n", path);
ERROR("faad2 error: %s\n", ERROR("faad2 error: %s\n",
faacDecGetErrorMessage(frameInfo.error)); faacDecGetErrorMessage(frameInfo.error));
eof = 1;
break; break;
} }
#ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE #ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
@ -395,10 +392,8 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
if (dc.command == DECODE_COMMAND_SEEK) { if (dc.command == DECODE_COMMAND_SEEK) {
dc.seekError = 1; dc.seekError = 1;
dc_command_finished(); dc_command_finished();
} else if (dc.command == DECODE_COMMAND_STOP) { } else if (dc.command == DECODE_COMMAND_STOP)
eof = 1;
break; break;
}
} }
decoder_flush(mpd_decoder); decoder_flush(mpd_decoder);

15
src/inputPlugins/mp4_plugin.c
View File

@ -95,7 +95,6 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
unsigned char channels; unsigned char channels;
long sampleId; long sampleId;
long numSamples; long numSamples;
int eof = 0;
long dur; long dur;
unsigned int sampleCount; unsigned int sampleCount;
char *sampleBuffer; char *sampleBuffer;
@ -178,7 +177,7 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
seekTable = xmalloc(sizeof(float) * numSamples); seekTable = xmalloc(sizeof(float) * numSamples);
for (sampleId = 0; sampleId < numSamples && !eof; sampleId++) { for (sampleId = 0; sampleId < numSamples; sampleId++) {
if (dc.command == DECODE_COMMAND_SEEK) if (dc.command == DECODE_COMMAND_SEEK)
seeking = 1; seeking = 1;
@ -221,10 +220,9 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
continue; continue;
if (mp4ff_read_sample(mp4fh, track, sampleId, &mp4Buffer, if (mp4ff_read_sample(mp4fh, track, sampleId, &mp4Buffer,
&mp4BufferSize) == 0) { &mp4BufferSize) == 0)
eof = 1; break;
continue;
}
#ifdef HAVE_FAAD_BUFLEN_FUNCS #ifdef HAVE_FAAD_BUFLEN_FUNCS
sampleBuffer = faacDecDecode(decoder, &frameInfo, mp4Buffer, sampleBuffer = faacDecDecode(decoder, &frameInfo, mp4Buffer,
mp4BufferSize); mp4BufferSize);
@ -237,7 +235,6 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
if (frameInfo.error > 0) { if (frameInfo.error > 0) {
ERROR("faad2 error: %s\n", ERROR("faad2 error: %s\n",
faacDecGetErrorMessage(frameInfo.error)); faacDecGetErrorMessage(frameInfo.error));
eof = 1;
break; break;
} }
@ -273,10 +270,8 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
decoder_data(mpd_decoder, inStream, 1, sampleBuffer, decoder_data(mpd_decoder, inStream, 1, sampleBuffer,
sampleBufferLen, file_time, sampleBufferLen, file_time,
bitRate, NULL); bitRate, NULL);
if (dc.command == DECODE_COMMAND_STOP) { if (dc.command == DECODE_COMMAND_STOP)
eof = 1;
break; break;
}
} }
free(seekTable); free(seekTable);