mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

cccombiner: Clean up property mutability

Browse source 
Most settings are copied from properties on the READY → PAUSED state
change. The recently added properties violate this scheme, and are
probably unsafe to change.

Make these properties consistently MUTABLE_READY. Also remove the unused
`output_padding` field.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7996>
This commit is contained in:
Jan Alexander Steffens (heftig) 2025-01-23 15:34:14 +01:00 committed by GStreamer Marge Bot
parent 26c598dd1b
commit 3c5f03dce1
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
View file

@ -8694,7 +8694,7 @@
"construct-only": false, "construct-only": false,
"controllable": false, "controllable": false,
"default": "valid", "default": "valid",
"mutable": "playing", "mutable": "ready",
"readable": true, "readable": true,
"type": "GstCCBufferCea608PaddingStrategy", "type": "GstCCBufferCea608PaddingStrategy",
"writable": true "writable": true
@ -8708,7 +8708,7 @@
"default": "18446744073709551615", "default": "18446744073709551615",
"max": "18446744073709551615", "max": "18446744073709551615",
"min": "0", "min": "0",
"mutable": "playing", "mutable": "ready",
"readable": true, "readable": true,
"type": "guint64", "type": "guint64",
"writable": true "writable": true
@ -8772,7 +8772,7 @@
"default": "18446744073709551615", "default": "18446744073709551615",
"max": "18446744073709551615", "max": "18446744073709551615",
"min": "0", "min": "0",
"mutable": "playing", "mutable": "ready",
"readable": true, "readable": true,
"type": "guint64", "type": "guint64",
"writable": true "writable": true

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

@ -355,19 +355,19 @@ dequeue_caption (GstCCCombiner * self, GstVideoTimeCode * tc, gboolean drain)
if (drain && cc_buffer_is_empty (self->cc_buffer)) if (drain && cc_buffer_is_empty (self->cc_buffer))
return; return;
if (self->prop_schedule_timeout != GST_CLOCK_TIME_NONE) { if (self->schedule_timeout != GST_CLOCK_TIME_NONE) {
if (self->last_caption_ts == GST_CLOCK_TIME_NONE) { if (self->last_caption_ts == GST_CLOCK_TIME_NONE) {
return; return;
} }
if (self->current_video_running_time > self->last_caption_ts if (self->current_video_running_time > self->last_caption_ts
&& self->current_video_running_time - self->last_caption_ts && self->current_video_running_time - self->last_caption_ts
> self->prop_schedule_timeout) { > self->schedule_timeout) {
GST_LOG_OBJECT (self, "Not outputting caption as last caption buffer ts %" GST_LOG_OBJECT (self, "Not outputting caption as last caption buffer ts %"
GST_TIME_FORMAT " is more than the schedule timeout %" GST_TIME_FORMAT GST_TIME_FORMAT " is more than the schedule timeout %" GST_TIME_FORMAT
" from the current output time %" GST_TIME_FORMAT, " from the current output time %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->last_caption_ts), GST_TIME_ARGS (self->last_caption_ts),
GST_TIME_ARGS (self->prop_schedule_timeout), GST_TIME_ARGS (self->schedule_timeout),
GST_TIME_ARGS (self->current_video_running_time)); GST_TIME_ARGS (self->current_video_running_time));
return; return;
} }
@ -1182,10 +1182,14 @@ gst_cc_combiner_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
self->schedule = self->prop_schedule; self->schedule = self->prop_schedule;
self->max_scheduled = self->prop_max_scheduled; self->max_scheduled = self->prop_max_scheduled;
self->output_padding = self->prop_output_padding; self->schedule_timeout = self->prop_schedule_timeout;
cc_buffer_set_max_buffer_time (self->cc_buffer, GST_CLOCK_TIME_NONE); cc_buffer_set_max_buffer_time (self->cc_buffer, GST_CLOCK_TIME_NONE);
cc_buffer_set_output_padding (self->cc_buffer, self->prop_output_padding, cc_buffer_set_output_padding (self->cc_buffer, self->prop_output_padding,
self->prop_output_padding); self->prop_output_padding);
cc_buffer_set_cea608_padding_strategy (self->cc_buffer,
self->prop_cea608_padding_strategy);
cc_buffer_set_cea608_valid_timeout (self->cc_buffer,
self->prop_cea608_valid_padding_timeout);
break; break;
default: default:
break; break;
@ -1212,13 +1216,9 @@ gst_cc_combiner_set_property (GObject * object, guint prop_id,
break; break;
case PROP_CEA608_PADDING_STRATEGY: case PROP_CEA608_PADDING_STRATEGY:
self->prop_cea608_padding_strategy = g_value_get_flags (value); self->prop_cea608_padding_strategy = g_value_get_flags (value);
cc_buffer_set_cea608_padding_strategy (self->cc_buffer,
self->prop_cea608_padding_strategy);
break; break;
case PROP_CEA608_VALID_PADDING_TIMEOUT: case PROP_CEA608_VALID_PADDING_TIMEOUT:
self->prop_cea608_valid_padding_timeout = g_value_get_uint64 (value); self->prop_cea608_valid_padding_timeout = g_value_get_uint64 (value);
cc_buffer_set_cea608_valid_timeout (self->cc_buffer,
self->prop_cea608_valid_padding_timeout);
break; break;
case PROP_SCHEDULE_TIMEOUT: case PROP_SCHEDULE_TIMEOUT:
self->prop_schedule_timeout = g_value_get_uint64 (value); self->prop_schedule_timeout = g_value_get_uint64 (value);
@ -1368,7 +1368,7 @@ gst_cc_combiner_class_init (GstCCCombinerClass * klass)
GST_TYPE_CC_BUFFER_CEA608_PADDING_STRATEGY, GST_TYPE_CC_BUFFER_CEA608_PADDING_STRATEGY,
DEFAULT_CEA608_PADDING_STRATEGY, DEFAULT_CEA608_PADDING_STRATEGY,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING)); GST_PARAM_MUTABLE_READY));
/** /**
* GstCCCombiner:cea608-padding-valid-timeout: * GstCCCombiner:cea608-padding-valid-timeout:
@ -1386,7 +1386,7 @@ gst_cc_combiner_class_init (GstCCCombinerClass * klass)
"How long after receiving valid non-padding CEA-608 data to keep writing valid CEA-608 padding bytes", "How long after receiving valid non-padding CEA-608 data to keep writing valid CEA-608 padding bytes",
0, G_MAXUINT64, DEFAULT_CEA608_VALID_PADDING_TIMEOUT, 0, G_MAXUINT64, DEFAULT_CEA608_VALID_PADDING_TIMEOUT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING)); GST_PARAM_MUTABLE_READY));
/** /**
* GstCCCombiner:schedule-timeout: * GstCCCombiner:schedule-timeout:
@ -1404,7 +1404,7 @@ gst_cc_combiner_class_init (GstCCCombinerClass * klass)
"How long after not receiving caption data on the caption pad to continue adding (padding) caption data on output buffers", "How long after not receiving caption data on the caption pad to continue adding (padding) caption data on output buffers",
0, G_MAXUINT64, DEFAULT_SCHEDULE_TIMEOUT, 0, G_MAXUINT64, DEFAULT_SCHEDULE_TIMEOUT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING)); GST_PARAM_MUTABLE_READY));
/** /**
* GstCCCombiner:input-meta-processing * GstCCCombiner:input-meta-processing
@ -1484,9 +1484,4 @@ gst_cc_combiner_init (GstCCCombiner * self)
self->last_caption_ts = GST_CLOCK_TIME_NONE; self->last_caption_ts = GST_CLOCK_TIME_NONE;
self->cc_buffer = cc_buffer_new (); self->cc_buffer = cc_buffer_new ();
cc_buffer_set_max_buffer_time (self->cc_buffer, GST_CLOCK_TIME_NONE);
cc_buffer_set_cea608_valid_timeout (self->cc_buffer,
self->prop_cea608_valid_padding_timeout);
cc_buffer_set_cea608_padding_strategy (self->cc_buffer,
self->prop_cea608_padding_strategy);
} }

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

@ -86,7 +86,7 @@ struct _GstCCCombiner
gboolean schedule; gboolean schedule;
guint max_scheduled; guint max_scheduled;
gboolean output_padding; GstClockTime schedule_timeout;
GstClockTime last_caption_ts; GstClockTime last_caption_ts;
CCBuffer *cc_buffer; CCBuffer *cc_buffer;