diff options
Diffstat (limited to 'swfdec/swfdec_audio_flv.c')
| -rw-r--r-- | swfdec/swfdec_audio_flv.c | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/swfdec/swfdec_audio_flv.c b/swfdec/swfdec_audio_flv.c index 2a49ee6e..4595f074 100644 --- a/swfdec/swfdec_audio_flv.c +++ b/swfdec/swfdec_audio_flv.c @@ -95,6 +95,18 @@ swfdec_audio_flv_decode_one (SwfdecAudioFlv *flv) flv->decoder = swfdec_audio_decoder_new (flv->format, flv->in); if (flv->decoder == NULL) return NULL; + /* This is a hack that ensures AAC codec data is always present, even if + * the decoder gets initialized in the middle of the stream */ + if (format == SWFDEC_AUDIO_CODEC_AAC) { + SwfdecBuffer *tmp = swfdec_flv_decoder_get_audio (flv->flvdecoder, + 0, &format, NULL, NULL, NULL); + if (format == SWFDEC_AUDIO_CODEC_AAC && tmp->data[0] == 0 && + tmp->length > 1) { + tmp = swfdec_buffer_new_subbuffer (tmp, 1, tmp->length - 1); + swfdec_audio_decoder_set_codec_data (flv->decoder, tmp); + swfdec_buffer_unref (tmp); + } + } } else if (format != flv->format || in != flv->in) { SWFDEC_ERROR ("FIXME: format change not implemented"); @@ -102,7 +114,36 @@ swfdec_audio_flv_decode_one (SwfdecAudioFlv *flv) } else if (flv->decoder == NULL) { return NULL; } - swfdec_audio_decoder_push (flv->decoder, buffer); + if (format == SWFDEC_AUDIO_CODEC_AAC) { + SwfdecBuffer *data; + SwfdecBits bits; + guint type; + swfdec_bits_init (&bits, buffer); + type = swfdec_bits_get_u8 (&bits); + switch (type) { + case 0: + data = swfdec_bits_get_buffer (&bits, -1); + if (data) { + swfdec_audio_decoder_set_codec_data (flv->decoder, data); + swfdec_buffer_unref (data); + } + break; + case 1: + data = swfdec_bits_get_buffer (&bits, -1); + if (data) { + swfdec_audio_decoder_push (flv->decoder, data); + swfdec_buffer_unref (data); + } else { + SWFDEC_ERROR ("no data in AAC data buffer?"); + } + break; + default: + SWFDEC_FIXME ("handle AAC type %u", type); + break; + } + } else { + swfdec_audio_decoder_push (flv->decoder, buffer); + } if (flv->next_timestamp == 0) swfdec_audio_decoder_push (flv->decoder, NULL); buffer = swfdec_audio_decoder_pull (flv->decoder); |