mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-08 08:25:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

cccombiner: Add video_pad field to avoid pad get/ref/unref

Browse source 
Saving a reference to this always-present pad simplifies the code and
avoids a lot of pad list scans and refcounting.

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 9cb2eb4b9b
commit 9ef06d77a7
2 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -736,9 +736,7 @@ gst_cc_combiner_aggregate (GstAggregator * aggregator, gboolean timeout)
GstClockTime video_start; GstClockTime video_start;
GstBuffer *video_buf; GstBuffer *video_buf;
video_pad = video_pad = self->video_pad;
GST_AGGREGATOR_PAD_CAST (gst_element_get_static_pad (GST_ELEMENT_CAST
(aggregator), "sink"));
video_buf = gst_aggregator_pad_peek_buffer (video_pad); video_buf = gst_aggregator_pad_peek_buffer (video_pad);
if (!video_buf) { if (!video_buf) {
if (gst_aggregator_pad_is_eos (video_pad)) { if (gst_aggregator_pad_is_eos (video_pad)) {
@ -762,14 +760,12 @@ gst_cc_combiner_aggregate (GstAggregator * aggregator, gboolean timeout)
flow_ret = GST_FLOW_OK; flow_ret = GST_FLOW_OK;
} }
gst_object_unref (video_pad);
return flow_ret; return flow_ret;
} }
video_start = GST_BUFFER_PTS (video_buf); video_start = GST_BUFFER_PTS (video_buf);
if (!GST_CLOCK_TIME_IS_VALID (video_start)) { if (!GST_CLOCK_TIME_IS_VALID (video_start)) {
gst_buffer_unref (video_buf); gst_buffer_unref (video_buf);
gst_object_unref (video_pad);
GST_ERROR_OBJECT (aggregator, "Video buffer without PTS"); GST_ERROR_OBJECT (aggregator, "Video buffer without PTS");
@ -783,7 +779,6 @@ gst_cc_combiner_aggregate (GstAggregator * aggregator, gboolean timeout)
GST_DEBUG_OBJECT (aggregator, "Buffer outside segment, dropping"); GST_DEBUG_OBJECT (aggregator, "Buffer outside segment, dropping");
gst_aggregator_pad_drop_buffer (video_pad); gst_aggregator_pad_drop_buffer (video_pad);
gst_buffer_unref (video_buf); gst_buffer_unref (video_buf);
gst_object_unref (video_pad);
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -832,8 +827,6 @@ gst_cc_combiner_aggregate (GstAggregator * aggregator, gboolean timeout)
GST_TIME_ARGS (self->current_video_running_time), GST_TIME_ARGS (self->current_video_running_time),
GST_TIME_ARGS (self->current_video_running_time_end)); GST_TIME_ARGS (self->current_video_running_time_end));
} }
gst_object_unref (video_pad);
} }
/* At this point we have a video buffer queued and can start collecting /* At this point we have a video buffer queued and can start collecting
@ -1019,8 +1012,7 @@ gst_cc_combiner_create_new_pad (GstAggregator * aggregator,
static gboolean static gboolean
gst_cc_combiner_src_query (GstAggregator * aggregator, GstQuery * query) gst_cc_combiner_src_query (GstAggregator * aggregator, GstQuery * query)
{ {
GstPad *video_sinkpad = GstCCCombiner *self = GST_CCCOMBINER (aggregator);
gst_element_get_static_pad (GST_ELEMENT_CAST (aggregator), "sink");
gboolean ret; gboolean ret;
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
@ -1029,7 +1021,7 @@ gst_cc_combiner_src_query (GstAggregator * aggregator, GstQuery * query)
case GST_QUERY_URI: case GST_QUERY_URI:
case GST_QUERY_CAPS: case GST_QUERY_CAPS:
case GST_QUERY_ALLOCATION: case GST_QUERY_ALLOCATION:
ret = gst_pad_peer_query (video_sinkpad, query); ret = gst_pad_peer_query (GST_PAD_CAST (self->video_pad), query);
break; break;
case GST_QUERY_ACCEPT_CAPS:{ case GST_QUERY_ACCEPT_CAPS:{
GstCaps *caps; GstCaps *caps;
@ -1047,8 +1039,6 @@ gst_cc_combiner_src_query (GstAggregator * aggregator, GstQuery * query)
break; break;
} }
gst_object_unref (video_sinkpad);
return ret; return ret;
} }
@ -1056,8 +1046,7 @@ static gboolean
gst_cc_combiner_sink_query (GstAggregator * aggregator, gst_cc_combiner_sink_query (GstAggregator * aggregator,
GstAggregatorPad * aggpad, GstQuery * query) GstAggregatorPad * aggpad, GstQuery * query)
{ {
GstPad *video_sinkpad = GstCCCombiner *self = GST_CCCOMBINER (aggregator);
gst_element_get_static_pad (GST_ELEMENT_CAST (aggregator), "sink");
GstPad *srcpad = GST_AGGREGATOR_SRC_PAD (aggregator); GstPad *srcpad = GST_AGGREGATOR_SRC_PAD (aggregator);
gboolean ret; gboolean ret;
@ -1067,7 +1056,7 @@ gst_cc_combiner_sink_query (GstAggregator * aggregator,
case GST_QUERY_DURATION: case GST_QUERY_DURATION:
case GST_QUERY_URI: case GST_QUERY_URI:
case GST_QUERY_ALLOCATION: case GST_QUERY_ALLOCATION:
if (GST_PAD_CAST (aggpad) == video_sinkpad) { if (aggpad == self->video_pad) {
ret = gst_pad_peer_query (srcpad, query); ret = gst_pad_peer_query (srcpad, query);
} else { } else {
ret = ret =
@ -1076,7 +1065,7 @@ gst_cc_combiner_sink_query (GstAggregator * aggregator,
} }
break; break;
case GST_QUERY_CAPS: case GST_QUERY_CAPS:
if (GST_PAD_CAST (aggpad) == video_sinkpad) { if (aggpad == self->video_pad) {
ret = gst_pad_peer_query (srcpad, query); ret = gst_pad_peer_query (srcpad, query);
} else { } else {
GstCaps *filter; GstCaps *filter;
@ -1097,7 +1086,7 @@ gst_cc_combiner_sink_query (GstAggregator * aggregator,
} }
break; break;
case GST_QUERY_ACCEPT_CAPS: case GST_QUERY_ACCEPT_CAPS:
if (GST_PAD_CAST (aggpad) == video_sinkpad) { if (aggpad == self->video_pad) {
ret = gst_pad_peer_query (srcpad, query); ret = gst_pad_peer_query (srcpad, query);
} else { } else {
GstCaps *caps; GstCaps *caps;
@ -1116,8 +1105,6 @@ gst_cc_combiner_sink_query (GstAggregator * aggregator,
break; break;
} }
gst_object_unref (video_sinkpad);
return ret; return ret;
} }
@ -1125,18 +1112,11 @@ static GstSample *
gst_cc_combiner_peek_next_sample (GstAggregator * agg, gst_cc_combiner_peek_next_sample (GstAggregator * agg,
GstAggregatorPad * aggpad) GstAggregatorPad * aggpad)
{ {
GstAggregatorPad *caption_pad, *video_pad;
GstCCCombiner *self = GST_CCCOMBINER (agg); GstCCCombiner *self = GST_CCCOMBINER (agg);
GstSample *res = NULL; GstSample *res = NULL;
caption_pad = if (aggpad != self->video_pad) {
GST_AGGREGATOR_PAD_CAST (gst_element_get_static_pad (GST_ELEMENT_CAST /* Must be the caption pad */
(self), "caption"));
video_pad =
GST_AGGREGATOR_PAD_CAST (gst_element_get_static_pad (GST_ELEMENT_CAST
(self), "sink"));
if (aggpad == caption_pad) {
if (self->current_frame_captions->len > 0) { if (self->current_frame_captions->len > 0) {
GstCaps *caps = gst_pad_get_current_caps (GST_PAD (aggpad)); GstCaps *caps = gst_pad_get_current_caps (GST_PAD (aggpad));
GstBufferList *buflist = gst_buffer_list_new (); GstBufferList *buflist = gst_buffer_list_new ();
@ -1154,7 +1134,7 @@ gst_cc_combiner_peek_next_sample (GstAggregator * agg,
gst_sample_set_buffer_list (res, buflist); gst_sample_set_buffer_list (res, buflist);
gst_buffer_list_unref (buflist); gst_buffer_list_unref (buflist);
} }
} else if (aggpad == video_pad) { } else {
if (self->current_video_buffer) { if (self->current_video_buffer) {
GstCaps *caps = gst_pad_get_current_caps (GST_PAD (aggpad)); GstCaps *caps = gst_pad_get_current_caps (GST_PAD (aggpad));
res = gst_sample_new (self->current_video_buffer, res = gst_sample_new (self->current_video_buffer,
@ -1163,12 +1143,6 @@ gst_cc_combiner_peek_next_sample (GstAggregator * agg,
} }
} }
if (caption_pad)
gst_object_unref (caption_pad);
if (video_pad)
gst_object_unref (video_pad);
return res; return res;
} }
@ -1451,13 +1425,12 @@ static void
gst_cc_combiner_init (GstCCCombiner * self) gst_cc_combiner_init (GstCCCombiner * self)
{ {
GstPadTemplate *templ; GstPadTemplate *templ;
GstAggregatorPad *agg_pad;
templ = gst_static_pad_template_get (&sinktemplate); templ = gst_static_pad_template_get (&sinktemplate);
agg_pad = g_object_new (GST_TYPE_AGGREGATOR_PAD, self->video_pad = g_object_new (GST_TYPE_AGGREGATOR_PAD,
"name", "sink", "direction", GST_PAD_SINK, "template", templ, NULL); "name", "sink", "direction", GST_PAD_SINK, "template", templ, NULL);
gst_object_unref (templ); gst_object_unref (templ);
gst_element_add_pad (GST_ELEMENT_CAST (self), GST_PAD_CAST (agg_pad)); gst_element_add_pad (GST_ELEMENT_CAST (self), GST_PAD_CAST (self->video_pad));
self->current_frame_captions = self->current_frame_captions =
g_array_new (FALSE, FALSE, sizeof (CaptionData)); g_array_new (FALSE, FALSE, sizeof (CaptionData));

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

@ -62,6 +62,8 @@ struct _GstCCCombiner
{ {
GstAggregator parent; GstAggregator parent;
GstAggregatorPad *video_pad;
gint video_fps_n, video_fps_d; gint video_fps_n, video_fps_d;
gboolean progressive; gboolean progressive;
GstClockTime previous_video_running_time_end; GstClockTime previous_video_running_time_end;