diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-25 19:47:33 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-26 03:01:43 +0100 |
| commit | bad350bc18ab81661253bf42245b9e3fa175d026 (patch) | |
| tree | 47a1dd5d4b81520eb9ae1ce407d2fea84d71736f /src/decoder/faad_plugin.c | |
| parent | 870436a592b081c4630b9ecc36ff8daecf6496cc (diff) | |
| download | mpd-bad350bc18ab81661253bf42245b9e3fa175d026.tar.gz mpd-bad350bc18ab81661253bf42245b9e3fa175d026.tar.xz mpd-bad350bc18ab81661253bf42245b9e3fa175d026.zip | |
decoder_api: added function decoder_timestamp()
Remove the data_time parameter from decoder_data(). This patch
eliminates the timestamp counting in most decoder plugins, because the
MPD core will do it automatically by default.
Diffstat (limited to 'src/decoder/faad_plugin.c')
| -rw-r--r-- | src/decoder/faad_plugin.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c index c91f8e8f6..2272963b9 100644 --- a/src/decoder/faad_plugin.c +++ b/src/decoder/faad_plugin.c @@ -383,7 +383,6 @@ static void faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) { GError *error = NULL; - float file_time; float total_time = 0; faacDecHandle decoder; struct audio_format audio_format; @@ -434,8 +433,6 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) /* the decoder loop */ - file_time = 0.0; - do { size_t frame_size; const void *decoded; @@ -481,15 +478,12 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) bit_rate = frame_info.bytesconsumed * 8.0 * frame_info.channels * audio_format.sample_rate / frame_info.samples / 1000 + 0.5; - file_time += - (float)(frame_info.samples) / frame_info.channels / - audio_format.sample_rate; } /* send PCM samples to MPD */ cmd = decoder_data(mpd_decoder, is, decoded, - (size_t)frame_info.samples * 2, file_time, + (size_t)frame_info.samples * 2, bit_rate, NULL); } while (cmd != DECODE_COMMAND_STOP); |