mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiodecoder: Handle CAPS events immediately instead of delaying them

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=733147
This commit is contained in:
Sebastian Dröge 2014-07-10 12:39:46 +02:00
parent 11ef208736
commit 368d75fe75
1 changed files with 4 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -238,8 +238,6 @@ struct _GstAudioDecoderPrivate
gboolean drained; gboolean drained;
/* subclass currently being forcibly drained */ /* subclass currently being forcibly drained */
gboolean force; gboolean force;
/* need to handle changed input caps */
gboolean do_caps;
/* input bps estimatation */ /* input bps estimatation */
/* global in bytes seen */ /* global in bytes seen */
@ -1730,21 +1728,6 @@ gst_audio_decoder_chain_reverse (GstAudioDecoder * dec, GstBuffer * buf)
return result; return result;
} }
static gboolean
gst_audio_decoder_do_caps (GstAudioDecoder * dec)
{
GstCaps *caps = gst_pad_get_current_caps (dec->sinkpad);
if (caps) {
if (!gst_audio_decoder_sink_setcaps (dec, caps)) {
gst_caps_unref (caps);
return FALSE;
}
gst_caps_unref (caps);
}
dec->priv->do_caps = FALSE;
return TRUE;
}
static GstFlowReturn static GstFlowReturn
gst_audio_decoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) gst_audio_decoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
{ {
@ -1753,12 +1736,6 @@ gst_audio_decoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
dec = GST_AUDIO_DECODER (parent); dec = GST_AUDIO_DECODER (parent);
if (G_UNLIKELY (dec->priv->do_caps)) {
if (!gst_audio_decoder_do_caps (dec)) {
goto not_negotiated;
}
}
if (G_UNLIKELY (!gst_pad_has_current_caps (pad) && dec->priv->needs_format)) if (G_UNLIKELY (!gst_pad_has_current_caps (pad) && dec->priv->needs_format))
goto not_negotiated; goto not_negotiated;
@ -1930,13 +1907,6 @@ gst_audio_decoder_handle_gap (GstAudioDecoder * dec, GstEvent * event)
gboolean ret; gboolean ret;
GstClockTime timestamp, duration; GstClockTime timestamp, duration;
/* Check if there is a caps pending to be pushed */
if (G_UNLIKELY (dec->priv->do_caps)) {
if (!gst_audio_decoder_do_caps (dec)) {
goto not_negotiated;
}
}
/* Ensure we have caps first */ /* Ensure we have caps first */
GST_AUDIO_DECODER_STREAM_LOCK (dec); GST_AUDIO_DECODER_STREAM_LOCK (dec);
if (!GST_AUDIO_INFO_IS_VALID (&dec->priv->ctx.info)) { if (!GST_AUDIO_INFO_IS_VALID (&dec->priv->ctx.info)) {
@ -1985,14 +1955,6 @@ gst_audio_decoder_handle_gap (GstAudioDecoder * dec, GstEvent * event)
} }
} }
return ret; return ret;
/* ERRORS */
not_negotiated:
{
GST_ELEMENT_ERROR (dec, CORE, NEGOTIATION, (NULL),
("decoder not initialized"));
return FALSE;
}
} }
static GList * static GList *
@ -2135,8 +2097,10 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event)
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
{ {
ret = TRUE; GstCaps *caps;
dec->priv->do_caps = TRUE;
gst_event_parse_caps (event, &caps);
ret = gst_audio_decoder_sink_setcaps (dec, caps);
gst_event_unref (event); gst_event_unref (event);
break; break;
} }