mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

amcaudiodec: Remove hack for Google MP3 decoder

Browse source 
The first buffer does not contain more garbage than any other MP3 decoder
outputs and we don't really know how much we have to drop or not.

After this change the output has the same duration as with mad.
This commit is contained in:
Sebastian Dröge 2014-09-01 17:41:50 +03:00
parent 114ee3355a
commit f5e73d2808
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/androidmedia/gstamcaudiodec.c
View file

@ -490,7 +490,6 @@ 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);
@ -506,16 +505,6 @@ 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;
}
}
if (buffer_info.size % self->info.bpf != 0)
goto invalid_buffer_size;
@ -934,7 +923,6 @@ gst_amc_audio_dec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
GST_STR_NULL (format_string));
g_free (format_string);
self->n_buffers = 0;
if (!gst_amc_codec_configure (self->codec, format, 0, &err)) {
GST_ERROR_OBJECT (self, "Failed to configure codec");
GST_ELEMENT_ERROR_FROM_ERROR (self, err);

3
sys/androidmedia/gstamcaudiodec.h
View file

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