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

decoder/faad: split faad_stream_decode() 

Eliminate duplicate cleanup code.
This commit is contained in:
Max Kellermann 2014-07-12 01:47:07 +02:00
parent 4c7b0b935b
commit da599e3f1a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/decoder/plugins/FaadDecoderPlugin.cxx
View File

@ -360,17 +360,11 @@ faad_get_file_time(InputStream &is)
} }
static void static void
faad_stream_decode(Decoder &mpd_decoder, InputStream &is) faad_stream_decode(Decoder &mpd_decoder, InputStream &is,
DecoderBuffer *buffer, const NeAACDecHandle decoder)
{ {
DecoderBuffer *buffer =
decoder_buffer_new(&mpd_decoder, is,
FAAD_MIN_STREAMSIZE * MAX_CHANNELS);
const float total_time = faad_song_duration(buffer, is); const float total_time = faad_song_duration(buffer, is);
/* create the libfaad decoder */
const NeAACDecHandle decoder = faad_decoder_new();
while (!decoder_buffer_is_full(buffer) && !is.LockIsEOF() && while (!decoder_buffer_is_full(buffer) && !is.LockIsEOF() &&
decoder_get_command(mpd_decoder) == DecoderCommand::NONE) { decoder_get_command(mpd_decoder) == DecoderCommand::NONE) {
adts_find_frame(buffer); adts_find_frame(buffer);
@ -383,8 +377,6 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
AudioFormat audio_format; AudioFormat audio_format;
if (!faad_decoder_init(decoder, buffer, audio_format, error)) { if (!faad_decoder_init(decoder, buffer, audio_format, error)) {
LogError(error); LogError(error);
NeAACDecClose(decoder);
decoder_buffer_free(buffer);
return; return;
} }
@ -448,6 +440,20 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
(size_t)frame_info.samples * 2, (size_t)frame_info.samples * 2,
bit_rate); bit_rate);
} while (cmd != DecoderCommand::STOP); } while (cmd != DecoderCommand::STOP);
}
static void
faad_stream_decode(Decoder &mpd_decoder, InputStream &is)
{
DecoderBuffer *buffer =
decoder_buffer_new(&mpd_decoder, is,
FAAD_MIN_STREAMSIZE * MAX_CHANNELS);
/* create the libfaad decoder */
const NeAACDecHandle decoder = faad_decoder_new();
faad_stream_decode(mpd_decoder, is, buffer, decoder);
/* cleanup */ /* cleanup */