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

faad: call decoder_initialized() after libfaad initialization

Browse Source 
Don't wait for the first frame to be decoded.  We already have the
sample rate and the channel count from faacDecInit().
This commit is contained in:
Max Kellermann 2009-02-17 23:26:51 +01:00
parent a72c7a7b18
commit 161bfc4bc0
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/decoder/faad_plugin.c
View File

@ -348,6 +348,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
float file_time; float file_time;
float total_time = 0; float total_time = 0;
faacDecHandle decoder; faacDecHandle decoder;
struct audio_format audio_format;
faacDecFrameInfo frame_info; faacDecFrameInfo frame_info;
faacDecConfigurationPtr config; faacDecConfigurationPtr config;
uint32_t sample_rate; uint32_t sample_rate;
@ -358,7 +359,6 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
size_t decoded_length; size_t decoded_length;
uint16_t bit_rate = 0; uint16_t bit_rate = 0;
struct decoder_buffer *buffer; struct decoder_buffer *buffer;
bool initialized = false;
enum decoder_command cmd; enum decoder_command cmd;
buffer = decoder_buffer_new(mpd_decoder, is, buffer = decoder_buffer_new(mpd_decoder, is,
@ -392,6 +392,20 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
return; return;
} }
audio_format = (struct audio_format){
.bits = 16,
.channels = channels,
.sample_rate = sample_rate,
};
if (!audio_format_valid(&audio_format)) {
g_warning("invalid audio format\n");
faacDecClose(decoder);
return;
}
decoder_initialized(mpd_decoder, &audio_format, false, total_time);
file_time = 0.0; file_time = 0.0;
do { do {
@ -406,26 +420,21 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
faacDecGetErrorMessage(frame_info.error)); faacDecGetErrorMessage(frame_info.error));
break; break;
} }
#ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
sample_rate = frame_info.samplerate;
#endif
if (!initialized) { if (frame_info.channels != channels) {
const struct audio_format audio_format = { g_warning("channel count changed from %u to %u",
.bits = 16, channels, frame_info.channels);
.channels = frame_info.channels,
.sample_rate = sample_rate,
};
if (!audio_format_valid(&audio_format)) {
g_warning("invalid audio format\n");
break; break;
} }
decoder_initialized(mpd_decoder, &audio_format, #ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
false, total_time); if (frame_info.samplerate != sample_rate) {
initialized = true; g_warning("sample rate changed from %u to %lu",
sample_rate,
(unsigned long)frame_info.samplerate);
break;
} }
#endif
decoder_buffer_consume(buffer, frame_info.bytesconsumed); decoder_buffer_consume(buffer, frame_info.bytesconsumed);