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

cccombiner: Add caption_pad field to avoid get_static_pad

Browse source 
Save a reference to the caption pad as well. This will make the
`get_next_time` implementation cheaper.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1746>
This commit is contained in:
Jan Alexander Steffens (heftig) 2022-02-18 17:06:44 +01:00 committed by GStreamer Marge Bot
parent 49ecde573c
commit 0f2583d286
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subprojects/gst-plugins-bad/ext/closedcaption/gstcccombiner.c
View file

@ -125,6 +125,8 @@ gst_cc_combiner_finalize (GObject * object)
{
GstCCCombiner *self = GST_CCCOMBINER (object);
gst_clear_object (&self->caption_pad);
g_array_unref (self->current_frame_captions);
self->current_frame_captions = NULL;
@ -512,9 +514,10 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout)
g_assert (self->current_video_buffer != NULL);
caption_pad =
GST_AGGREGATOR_PAD_CAST (gst_element_get_static_pad (GST_ELEMENT_CAST
(self), "caption"));
GST_OBJECT_LOCK (self);
caption_pad = self->caption_pad ? gst_object_ref (self->caption_pad) : NULL;
GST_OBJECT_UNLOCK (self);
/* No caption pad, forward buffer directly */
if (!caption_pad) {
GST_LOG_OBJECT (self, "No caption pad, passing through video");
@ -998,11 +1001,26 @@ gst_cc_combiner_create_new_pad (GstAggregator * aggregator,
agg_pad = g_object_new (GST_TYPE_AGGREGATOR_PAD,
"name", "caption", "direction", GST_PAD_SINK, "template", templ, NULL);
self->caption_type = GST_VIDEO_CAPTION_TYPE_UNKNOWN;
self->caption_pad = gst_object_ref (agg_pad);
GST_OBJECT_UNLOCK (self);
return agg_pad;
}
static void
gst_cc_combiner_release_pad (GstElement * element, GstPad * pad)
{
GstCCCombiner *self = GST_CCCOMBINER (element);
GST_OBJECT_LOCK (self);
if (pad == GST_PAD_CAST (self->caption_pad)) {
gst_clear_object (&self->caption_pad);
}
GST_OBJECT_UNLOCK (self);
GST_ELEMENT_CLASS (parent_class)->release_pad (element, pad);
}
static gboolean
gst_cc_combiner_src_query (GstAggregator * aggregator, GstQuery * query)
{
@ -1397,6 +1415,8 @@ gst_cc_combiner_class_init (GstCCCombinerClass * klass)
gstelement_class->change_state =
GST_DEBUG_FUNCPTR (gst_cc_combiner_change_state);
gstelement_class->release_pad =
GST_DEBUG_FUNCPTR (gst_cc_combiner_release_pad);
aggregator_class->aggregate = gst_cc_combiner_aggregate;
aggregator_class->stop = gst_cc_combiner_stop;

2
subprojects/gst-plugins-bad/ext/closedcaption/gstcccombiner.h
View file

@ -62,7 +62,7 @@ struct _GstCCCombiner
{
GstAggregator parent;
GstAggregatorPad *video_pad;
GstAggregatorPad *video_pad, *caption_pad;
gint video_fps_n, video_fps_d;
gboolean progressive;