mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-03 05:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

glvideomixer: Implement force-live and min-upstream-latency properties

Browse source 
Proxy the force-live and min-upstream-latency propertyies to the internal
glvideomixerelement at construction time. force-live has to be set
during construction of the glvideomixerelement, so that has to be
deferred until the _constructed() call. Make sure that all other
existing proxied properties will still get set once the element
is created.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4494>
This commit is contained in:
Jan Schmidt 2023-04-27 03:50:44 +10:00 committed by GStreamer Marge Bot
parent 5ef2ce69ff
commit e1faaefea0
4 changed files with 119 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json
View file

@ -5546,6 +5546,18 @@
"type": "GstGLContext",
"writable": false
},
"force-live": {
"blurb": "Always operate in live mode and aggregate on timeout regardless of whether any live sources are linked upstream",
"conditionally-available": false,
"construct": false,
"construct-only": true,
"controllable": false,
"default": "false",
"mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
},
"latency": {
"blurb": "Additional latency in live mode to allow upstream to take longer to produce buffers for the current position (in nanoseconds)",
"conditionally-available": false,
@ -5560,6 +5572,20 @@
"type": "guint64",
"writable": true
},
"min-upstream-latency": {
"blurb": "When sources with a higher latency are expected to be plugged in dynamically after the aggregator has started playing, this allows overriding the minimum latency reported by the initial source(s). This is only taken into account when larger than the actually reported minimum latency. (nanoseconds)",
"conditionally-available": false,
"construct": false,
"construct-only": false,
"controllable": false,
"default": "0",
"max": "18446744073709551615",
"min": "0",
"mutable": "null",
"readable": true,
"type": "guint64",
"writable": true
},
"mixer": {
"blurb": "The GL mixer chain to use",
"conditionally-available": false,

74
subprojects/gst-plugins-base/ext/gl/gstglmixerbin.c
View file

@ -31,9 +31,11 @@
#define GST_CAT_DEFAULT gst_gl_mixer_bin_debug
GST_DEBUG_CATEGORY (gst_gl_mixer_bin_debug);
#define DEFAULT_FORCE_LIVE FALSE
#define DEFAULT_LATENCY 0
#define DEFAULT_START_TIME_SELECTION 0
#define DEFAULT_START_TIME (-1)
#define DEFAULT_MIN_UPSTREAM_LATENCY (0)
typedef enum
{
@ -124,6 +126,8 @@ enum
PROP_START_TIME_SELECTION,
PROP_START_TIME,
PROP_CONTEXT,
PROP_FORCE_LIVE,
PROP_MIN_UPSTREAM_LATENCY,
};
enum
@ -215,6 +219,44 @@ gst_gl_mixer_bin_class_init (GstGLMixerBinClass * klass)
"Get OpenGL context",
GST_TYPE_GL_CONTEXT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GstGLMixerBin:force-live:
*
* Causes the element to aggregate on a timeout even when no live source is
* connected to its sinks. See #GstGLMixerBin:min-upstream-latency for a
* companion property: in the vast majority of cases where you plan to plug in
* live sources with a non-zero latency, you should set it to a non-zero value.
*
* Since: 1.24
*/
g_object_class_install_property (gobject_class, PROP_FORCE_LIVE,
g_param_spec_boolean ("force-live",
"Force Live",
"Always operate in live mode and aggregate on timeout regardless of whether any live sources are linked upstream",
DEFAULT_FORCE_LIVE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
/**
* GstGLMixerBin:min-upstream-latency:
*
* Force minimum upstream latency (in nanoseconds). When sources with a
* higher latency are expected to be plugged in dynamically after the
* aggregator has started playing, this allows overriding the minimum
* latency reported by the initial source(s). This is only taken into
* account when larger than the actually reported minimum latency.
*
* Since: 1.24
*/
g_object_class_install_property (gobject_class, PROP_MIN_UPSTREAM_LATENCY,
g_param_spec_uint64 ("min-upstream-latency", "Buffer latency",
"When sources with a higher latency are expected to be plugged "
"in dynamically after the aggregator has started playing, "
"this allows overriding the minimum latency reported by the "
"initial source(s). This is only taken into account when larger "
"than the actually reported minimum latency. (nanoseconds)",
0, G_MAXUINT64,
DEFAULT_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstMixerBin::create-element:
* @object: the #GstGLMixerBin
@ -270,6 +312,12 @@ gst_gl_mixer_bin_init (GstGLMixerBin * self)
if (!res)
GST_ERROR_OBJECT (self, "failed to create output chain");
self->force_live = DEFAULT_FORCE_LIVE;
self->latency = DEFAULT_LATENCY;
self->start_time_selection = DEFAULT_START_TIME_SELECTION;
self->start_time = DEFAULT_START_TIME;
self->min_upstream_latency = DEFAULT_MIN_UPSTREAM_LATENCY;
}
static void
@ -448,6 +496,9 @@ gst_gl_mixer_bin_get_property (GObject * object,
case PROP_MIXER:
g_value_set_object (value, self->mixer);
break;
case PROP_FORCE_LIVE:
g_value_set_boolean (value, self->force_live);
break;
default:
if (self->mixer)
g_object_get_property (G_OBJECT (self->mixer), pspec->name, value);
@ -474,6 +525,29 @@ gst_gl_mixer_bin_set_property (GObject * object,
}
break;
}
case PROP_FORCE_LIVE:
self->force_live = g_value_get_boolean (value);
break;
case PROP_LATENCY:
self->latency = g_value_get_uint64 (value);
if (self->mixer)
g_object_set_property (G_OBJECT (self->mixer), pspec->name, value);
break;
case PROP_START_TIME_SELECTION:
self->start_time_selection = g_value_get_uint (value);
if (self->mixer)
g_object_set_property (G_OBJECT (self->mixer), pspec->name, value);
break;
case PROP_START_TIME:
self->start_time = g_value_get_uint64 (value);
if (self->mixer)
g_object_set_property (G_OBJECT (self->mixer), pspec->name, value);
break;
case PROP_MIN_UPSTREAM_LATENCY:
self->min_upstream_latency = g_value_get_uint64 (value);
if (self->mixer)
g_object_set_property (G_OBJECT (self->mixer), pspec->name, value);
break;
default:
if (self->mixer)
g_object_set_property (G_OBJECT (self->mixer), pspec->name, value);

7
subprojects/gst-plugins-base/ext/gl/gstglmixerbin.h
View file

@ -53,6 +53,13 @@ struct _GstGLMixerBin
GstElement *download;
GstPad *srcpad;
gboolean force_live;
GstClockTime latency;
guint start_time_selection;
GstClockTime start_time;
GstClockTime min_upstream_latency;
GstGLMixerBinPrivate *priv;
};

13
subprojects/gst-plugins-base/ext/gl/gstglvideomixer.c
View file

@ -563,11 +563,21 @@ GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (glvideomixer, "glvideomixer",
static void
gst_gl_video_mixer_bin_init (GstGLVideoMixerBin * self)
{
}
static void
gst_gl_video_mixer_bin_constructed (GObject * self)
{
GstGLMixerBin *mix_bin = GST_GL_MIXER_BIN (self);
gst_gl_mixer_bin_finish_init_with_element (mix_bin,
g_object_new (GST_TYPE_GL_VIDEO_MIXER, NULL));
g_object_new (GST_TYPE_GL_VIDEO_MIXER,
"force-live", mix_bin->force_live,
"latency", mix_bin->latency,
"start-time-selection", mix_bin->start_time_selection,
"start-time", mix_bin->start_time,
"min-upstream-latency", mix_bin->min_upstream_latency, NULL));
}
static void
@ -580,6 +590,7 @@ gst_gl_video_mixer_bin_class_init (GstGLVideoMixerBinClass * klass)
mixer_class->create_input_pad = _create_video_mixer_input;
gobject_class->constructed = gst_gl_video_mixer_bin_constructed;
gobject_class->set_property = gst_gl_video_mixer_bin_set_property;
gobject_class->get_property = gst_gl_video_mixer_bin_get_property;