mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: Make sure to push pre-caps events before the caps event

Browse source
This commit is contained in:
Sebastian Dröge 2013-05-08 15:56:34 +02:00
parent 3e4aec6e7b
commit 351405d8a0
2 changed files with 72 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -533,6 +533,29 @@ gst_audio_decoder_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static gboolean
gst_audio_decoder_push_event (GstAudioDecoder * dec, GstEvent * event)
{
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEGMENT:{
GstSegment seg;
GST_AUDIO_DECODER_STREAM_LOCK (dec);
gst_event_copy_segment (event, &seg);
GST_DEBUG_OBJECT (dec, "starting segment %" GST_SEGMENT_FORMAT, &seg);
dec->output_segment = seg;
GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
break;
}
default:
break;
}
return gst_pad_push_event (dec->srcpad, event);
}
static gboolean static gboolean
gst_audio_decoder_negotiate_default (GstAudioDecoder * dec) gst_audio_decoder_negotiate_default (GstAudioDecoder * dec)
{ {
@ -552,7 +575,30 @@ gst_audio_decoder_negotiate_default (GstAudioDecoder * dec)
GST_DEBUG_OBJECT (dec, "setting src caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (dec, "setting src caps %" GST_PTR_FORMAT, caps);
if (dec->priv->pending_events) {
GList *pending_events, *l;
gboolean set_caps = FALSE;
pending_events = dec->priv->pending_events;
dec->priv->pending_events = NULL;
GST_DEBUG_OBJECT (dec, "Pushing pending events");
for (l = pending_events; l; l = l->next) {
GstEvent *event = GST_EVENT (l->data);
if (GST_EVENT_TYPE (event) > GST_EVENT_CAPS && !set_caps) {
res = gst_pad_set_caps (dec->srcpad, caps); res = gst_pad_set_caps (dec->srcpad, caps);
set_caps = TRUE;
}
gst_audio_decoder_push_event (dec, l->data);
}
g_list_free (pending_events);
if (!set_caps) {
res = gst_pad_set_caps (dec->srcpad, caps);
}
} else {
res = gst_pad_set_caps (dec->srcpad, caps);
}
if (!res) if (!res)
goto done; goto done;
@ -917,29 +963,6 @@ again:
return ret; return ret;
} }
static gboolean
gst_audio_decoder_push_event (GstAudioDecoder * dec, GstEvent * event)
{
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEGMENT:{
GstSegment seg;
GST_AUDIO_DECODER_STREAM_LOCK (dec);
gst_event_copy_segment (event, &seg);
GST_DEBUG_OBJECT (dec, "starting segment %" GST_SEGMENT_FORMAT, &seg);
dec->output_segment = seg;
GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
break;
}
default:
break;
}
return gst_pad_push_event (dec->srcpad, event);
}
static void static void
send_pending_events (GstAudioDecoder * dec) send_pending_events (GstAudioDecoder * dec)
{ {

24
gst-libs/gst/audio/gstaudioencoder.c
View file

@ -2560,7 +2560,31 @@ gst_audio_encoder_negotiate_default (GstAudioEncoder * enc)
GST_DEBUG_OBJECT (enc, "Setting srcpad caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (enc, "Setting srcpad caps %" GST_PTR_FORMAT, caps);
if (enc->priv->pending_events) {
GList *pending_events, *l;
gboolean set_caps = FALSE;
pending_events = enc->priv->pending_events;
enc->priv->pending_events = NULL;
GST_DEBUG_OBJECT (enc, "Pushing pending events");
for (l = pending_events; l; l = l->next) {
GstEvent *event = GST_EVENT (l->data);
if (GST_EVENT_TYPE (event) > GST_EVENT_CAPS && !set_caps) {
res = gst_pad_set_caps (enc->srcpad, caps); res = gst_pad_set_caps (enc->srcpad, caps);
set_caps = TRUE;
}
gst_audio_encoder_push_event (enc, l->data);
}
g_list_free (pending_events);
if (!set_caps) {
res = gst_pad_set_caps (enc->srcpad, caps);
}
} else {
res = gst_pad_set_caps (enc->srcpad, caps);
}
if (!res) if (!res)
goto done; goto done;
enc->priv->ctx.output_caps_changed = FALSE; enc->priv->ctx.output_caps_changed = FALSE;