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

faad: variable cleanup

Browse Source 
Make some variables more local, and eliminate superfluous ones.
This commit is contained in:
Max Kellermann 2009-02-17 23:44:29 +01:00
parent 122e0f3338
commit 4aca1fa493
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/decoder/faad_plugin.c
View File

@ -370,12 +370,8 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
float total_time = 0; float total_time = 0;
faacDecHandle decoder; faacDecHandle decoder;
struct audio_format audio_format; struct audio_format audio_format;
faacDecFrameInfo frame_info;
faacDecConfigurationPtr config; faacDecConfigurationPtr config;
unsigned long sample_count;
bool ret; bool ret;
const void *decoded;
size_t decoded_length;
uint16_t bit_rate = 0; uint16_t bit_rate = 0;
struct decoder_buffer *buffer; struct decoder_buffer *buffer;
enum decoder_command cmd; enum decoder_command cmd;
@ -430,6 +426,8 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
do { do {
size_t frame_size; size_t frame_size;
const void *decoded;
faacDecFrameInfo frame_info;
/* find the next frame */ /* find the next frame */
@ -467,8 +465,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
/* update bit rate and position */ /* update bit rate and position */
sample_count = (unsigned long)frame_info.samples; if (frame_info.samples > 0) {
if (sample_count > 0) {
bit_rate = frame_info.bytesconsumed * 8.0 * bit_rate = frame_info.bytesconsumed * 8.0 *
frame_info.channels * audio_format.sample_rate / frame_info.channels * audio_format.sample_rate /
frame_info.samples / 1000 + 0.5; frame_info.samples / 1000 + 0.5;
@ -479,10 +476,8 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
/* send PCM samples to MPD */ /* send PCM samples to MPD */
decoded_length = sample_count * 2;
cmd = decoder_data(mpd_decoder, is, decoded, cmd = decoder_data(mpd_decoder, is, decoded,
decoded_length, file_time, (size_t)frame_info.samples * 2, file_time,
bit_rate, NULL); bit_rate, NULL);
} while (cmd != DECODE_COMMAND_STOP); } while (cmd != DECODE_COMMAND_STOP);