mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add workaround for Google MP3 decoder outputting garbage in first output buffer

Browse source 
And assume one decoded input frame per output buffer to fix timestamp
handling by the base class.
This commit is contained in:
Sebastian Dröge 2012-10-09 10:27:36 +02:00
parent 2f3b2c586f
commit b0b642d8ab
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/androidmedia/gstamcaudiodec.c
View file

@ -586,8 +586,10 @@ retry:
buffer_info.flags);
is_eos = ! !(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM);
self->n_buffers++;
if (buffer_info.size > 0) {
GstAmcAudioDecClass *klass = GST_AMC_AUDIO_DEC_GET_CLASS (self);
GstBuffer *outbuf;
GstAmcBuffer *buf;
@ -598,6 +600,16 @@ retry:
if (idx >= self->n_output_buffers)
goto invalid_buffer_index;
if (strcmp (klass->codec_info->name, "OMX.google.mp3.decoder") == 0) {
/* Google's MP3 decoder outputs garbage in the first output buffer
* so we just drop it here */
if (self->n_buffers == 1) {
GST_DEBUG_OBJECT (self,
"Skipping first buffer of Google MP3 decoder output");
goto done;
}
}
outbuf = gst_buffer_try_new_and_alloc (buffer_info.size);
if (!outbuf)
goto failed_allocate;
@ -606,10 +618,15 @@ retry:
orc_memcpy (GST_BUFFER_DATA (outbuf), buf->data + buffer_info.offset,
buffer_info.size);
/* FIXME: We should get one decoded input frame here for
* every buffer. If this is not the case somewhere, we will
* error out at some point and will need to add workarounds
*/
flow_ret =
gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (self), outbuf, -1);
gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (self), outbuf, 1);
}
done:
if (!gst_amc_codec_release_output_buffer (self->codec, idx))
goto failed_release;
@ -894,6 +911,7 @@ gst_amc_audio_dec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
GST_DEBUG_OBJECT (self, "Configuring codec with format: %s", format_string);
g_free (format_string);
self->n_buffers = 0;
if (!gst_amc_codec_configure (self->codec, format, 0)) {
GST_ERROR_OBJECT (self, "Failed to configure codec");
return FALSE;

3
sys/androidmedia/gstamcaudiodec.h
View file

@ -80,6 +80,9 @@ struct _GstAmcAudioDec
gboolean eos;
GstFlowReturn downstream_flow_ret;
/* Output buffers counter */
gint n_buffers;
};
struct _GstAmcAudioDecClass