mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: simplify some more

Browse source 
If we get a context in the chain functions we always need to do a full update of
the context on the peer pad.
This commit is contained in:
Wim Taymans 2011-05-05 19:24:46 +02:00
parent d3e0a37900
commit f663c9770b
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/gstpad.c
View file

@ -3491,13 +3491,8 @@ gst_pad_chain_data_unchecked (GstPad * pad, gboolean is_buffer, void *data,
if (G_LIKELY (context)) { if (G_LIKELY (context)) {
GstContext *oldctx = GST_PAD_CONTEXT (pad); GstContext *oldctx = GST_PAD_CONTEXT (pad);
if (G_UNLIKELY (context != oldctx)) { GST_PAD_CONTEXT (pad) = context;
GST_PAD_CONTEXT (pad) = context; gst_context_unref (oldctx);
gst_context_unref (oldctx);
} else {
gst_context_unref (context);
context = NULL;
}
} }
emit_signal = GST_PAD_DO_BUFFER_SIGNALS (pad) > 0; emit_signal = GST_PAD_DO_BUFFER_SIGNALS (pad) > 0;
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
@ -3771,8 +3766,7 @@ gst_pad_push_data (GstPad * pad, gboolean is_buffer, void *data,
/* if we have a context pending, push it along too */ /* if we have a context pending, push it along too */
if (GST_PAD_IS_CONTEXT_PENDING (pad)) { if (GST_PAD_IS_CONTEXT_PENDING (pad)) {
context = GST_PAD_CONTEXT (pad); if (G_LIKELY ((context = GST_PAD_CONTEXT (pad))))
if (G_LIKELY (context))
gst_context_ref (context); gst_context_ref (context);
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_CONTEXT_PENDING); GST_OBJECT_FLAG_UNSET (pad, GST_PAD_CONTEXT_PENDING);
} }
@ -4433,13 +4427,8 @@ gst_pad_pull_range (GstPad * pad, guint64 offset, guint size,
if (G_UNLIKELY (context)) { if (G_UNLIKELY (context)) {
GstContext *oldctx = GST_PAD_CONTEXT (pad); GstContext *oldctx = GST_PAD_CONTEXT (pad);
if (G_UNLIKELY (context != oldctx)) { GST_PAD_CONTEXT (pad) = context;
GST_PAD_CONTEXT (pad) = context; gst_context_unref (oldctx);
gst_context_unref (oldctx);
} else {
gst_context_unref (context);
context = NULL;
}
} }
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);