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

compositor: Define crossfade-ratio to have range [0.0,1.0]

Browse source 
Previously negative values had the same effect as 0.0, which was
confusing.

https://bugzilla.gnome.org/show_bug.cgi?id=796845
This commit is contained in:
Sebastian Dröge 2018-08-16 17:07:06 +03:00
parent 8430e47006
commit 5485a2b9ee
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/compositor/compositor.c
View file

@ -128,7 +128,7 @@ static void gst_compositor_child_proxy_init (gpointer g_iface,
#define DEFAULT_PAD_WIDTH 0 #define DEFAULT_PAD_WIDTH 0
#define DEFAULT_PAD_HEIGHT 0 #define DEFAULT_PAD_HEIGHT 0
#define DEFAULT_PAD_ALPHA 1.0 #define DEFAULT_PAD_ALPHA 1.0
#define DEFAULT_PAD_CROSSFADE_RATIO -1.0 #define DEFAULT_PAD_CROSSFADE_RATIO 0.0
enum enum
{ {
PROP_PAD_0, PROP_PAD_0,
@ -203,7 +203,7 @@ gst_compositor_pad_set_property (GObject * object, guint prop_id,
case PROP_PAD_CROSSFADE_RATIO: case PROP_PAD_CROSSFADE_RATIO:
pad->crossfade = g_value_get_double (value); pad->crossfade = g_value_get_double (value);
gst_video_aggregator_pad_set_needs_alpha (GST_VIDEO_AGGREGATOR_PAD (pad), gst_video_aggregator_pad_set_needs_alpha (GST_VIDEO_AGGREGATOR_PAD (pad),
pad->crossfade >= 0.0f); pad->crossfade > 0.0);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -336,8 +336,8 @@ gst_compositor_pad_prepare_frame (GstVideoAggregatorPad * pad,
GST_OBJECT_LOCK (vagg); GST_OBJECT_LOCK (vagg);
/* Check if we are crossfading the pad one way or another */ /* Check if we are crossfading the pad one way or another */
l = g_list_find (GST_ELEMENT (vagg)->sinkpads, pad); l = g_list_find (GST_ELEMENT (vagg)->sinkpads, pad);
if ((l->prev && GST_COMPOSITOR_PAD (l->prev->data)->crossfade >= 0.0) || if ((l->prev && GST_COMPOSITOR_PAD (l->prev->data)->crossfade > 0.0) ||
(GST_COMPOSITOR_PAD (pad)->crossfade >= 0.0)) { (GST_COMPOSITOR_PAD (pad)->crossfade > 0.0)) {
GST_DEBUG_OBJECT (pad, "Is being crossfaded with previous pad"); GST_DEBUG_OBJECT (pad, "Is being crossfaded with previous pad");
l = NULL; l = NULL;
} else { } else {
@ -471,9 +471,8 @@ gst_compositor_pad_class_init (GstCompositorPadClass * klass)
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PAD_CROSSFADE_RATIO, g_object_class_install_property (gobject_class, PROP_PAD_CROSSFADE_RATIO,
g_param_spec_double ("crossfade-ratio", "Crossfade ratio", g_param_spec_double ("crossfade-ratio", "Crossfade ratio",
"The crossfade ratio to use while crossfading with the following pad." "The crossfade ratio to use while crossfading with the following pad",
"A value inferior to 0 means no crossfading.", 0.0, 1.0, DEFAULT_PAD_CROSSFADE_RATIO,
-1.0, 1.0, DEFAULT_PAD_CROSSFADE_RATIO,
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
vaggpadclass->prepare_frame = vaggpadclass->prepare_frame =
@ -881,8 +880,8 @@ gst_compositor_crossfade_frames (GstCompositor * self, GstVideoFrame * outframe)
for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) { for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) {
GstCompositorPad *compo_pad = GST_COMPOSITOR_PAD (l->data); GstCompositorPad *compo_pad = GST_COMPOSITOR_PAD (l->data);
if (compo_pad->crossfade < 0.0 && l->next && if (compo_pad->crossfade == 0.0 && l->next &&
GST_COMPOSITOR_PAD (l->next->data)->crossfade < 0) { GST_COMPOSITOR_PAD (l->next->data)->crossfade == 0.0) {
all_crossfading = FALSE; all_crossfading = FALSE;
break; break;
@ -898,7 +897,7 @@ gst_compositor_crossfade_frames (GstCompositor * self, GstVideoFrame * outframe)
GstVideoFrame *prepared_frame = GstVideoFrame *prepared_frame =
gst_video_aggregator_pad_get_prepared_frame (pad); gst_video_aggregator_pad_get_prepared_frame (pad);
if (compo_pad->crossfade >= 0.0f && prepared_frame) { if (compo_pad->crossfade > 0.0 && prepared_frame) {
gfloat alpha = compo_pad->crossfade * compo_pad->alpha; gfloat alpha = compo_pad->crossfade * compo_pad->alpha;
GstVideoAggregatorPad *npad = l->next ? l->next->data : NULL; GstVideoAggregatorPad *npad = l->next ? l->next->data : NULL;
GstVideoFrame *next_prepared_frame; GstVideoFrame *next_prepared_frame;