mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 18:20:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges-video-transition: add a new "fade-in" transition type

Browse source 
This transition is meant to be very similar to crossfade, but
instead of fading out the background video at the same time as the
foreground fades in, the background video stays at 100% opacity
during the whole transition.

This essentially "restores" the old crossfade behaviour that was changed in:
eb48faf342
but using a new type enum, so that both behaviours are available,
letting applications choose.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2385>
This commit is contained in:
George Kiagiadakis 2022-05-06 12:17:14 +03:00
parent 1cb4c050d0
commit 5294a720f8
3 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
subprojects/gst-editing-services/ges/ges-enums.c
View file

@ -437,6 +437,9 @@ static GEnumValue transition_types[] = {
{GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE,
"GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE",
"crossfade"},
{GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN,
"GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN",
"fade-in"},
{0, NULL, NULL}
};

12
subprojects/gst-editing-services/ges/ges-enums.h
View file

@ -143,6 +143,7 @@ typedef enum {
* @GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_V: Two sets of radial hands attached at the midpoints of the top and bottom halves sweep from top to bottom and bottom to top,
* @GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_H: Two sets of radial hands attached at the midpoints of the left and right halves sweep from left to right and right to left,
* @GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE: Crossfade
* @GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN: Similar to crossfade, but fade in the front video without fading out the background one (Since: 1.22)
*
*/
@ -218,7 +219,16 @@ typedef enum {
GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_U = 262,
GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_V = 263,
GES_VIDEO_STANDARD_TRANSITION_TYPE_WINDSHIELD_H = 264,
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE = 512
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE = 512,
/**
* GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN:
*
* Similar to crossfade, but fade in the front video without fading out
* the background one
*
* Since: 1.22
*/
GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN = 513
} GESVideoStandardTransitionType;
#define GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE \

28
subprojects/gst-editing-services/ges/ges-video-transition.c
View file

@ -337,10 +337,14 @@ ges_video_transition_create_element (GESTrackElement * object)
GESVideoTransition *self;
GESVideoTransitionPrivate *priv;
const gchar *smpte_properties[] = { "invert", "border", NULL };
gboolean is_fade;
self = GES_VIDEO_TRANSITION (object);
priv = self->priv;
is_fade = (priv->type == GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ||
priv->type == GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN);
GST_LOG ("creating a video bin");
topbin = gst_bin_new ("transition-bin");
@ -373,11 +377,9 @@ ges_video_transition_create_element (GESTrackElement * object)
g_object_set (priv->mixer_sinka, "zorder", 0, NULL);
g_object_set (priv->mixer_sinkb, "zorder", 1, NULL);
gst_util_set_object_arg (G_OBJECT (priv->mixer_sinka), "operator",
priv->type ==
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ? "source" : "over");
is_fade ? "source" : "over");
gst_util_set_object_arg (G_OBJECT (priv->mixer_sinkb), "operator",
priv->type ==
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ? "add" : "over");
is_fade ? "add" : "over");
fast_element_link (mixer, priv->positioner);
@ -480,6 +482,13 @@ ges_video_transition_update_control_sources (GESVideoTransition * self,
(priv->fade_out_control_source, duration, 1.0, 0.0);
ges_video_transition_update_control_source (priv->smpte_control_source,
duration, 0.0, 0.0);
} else if (type == GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN) {
ges_video_transition_update_control_source
(priv->fade_in_control_source, duration, 0.0, 1.0);
ges_video_transition_update_control_source
(priv->fade_out_control_source, duration, 1.0, 1.0);
ges_video_transition_update_control_source (priv->smpte_control_source,
duration, 0.0, 0.0);
} else {
ges_video_transition_update_control_source
(priv->fade_in_control_source, duration, 1.0, 1.0);
@ -531,6 +540,7 @@ ges_video_transition_set_transition_type_internal (GESVideoTransition
* self, GESVideoStandardTransitionType type)
{
GESVideoTransitionPrivate *priv = self->priv;
gboolean is_fade;
GST_DEBUG ("%p %d => %d", self, priv->type, type);
@ -547,17 +557,17 @@ ges_video_transition_set_transition_type_internal (GESVideoTransition
ges_video_transition_update_control_sources (self, type);
priv->type = type;
is_fade = (type == GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ||
type == GES_VIDEO_STANDARD_TRANSITION_TYPE_FADE_IN);
if (type != GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE) {
if (!is_fade) {
g_object_set (priv->smpte, "type", (gint) type, NULL);
}
gst_util_set_object_arg (G_OBJECT (priv->mixer_sinka), "operator",
priv->type ==
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ? "source" : "over");
is_fade ? "source" : "over");
gst_util_set_object_arg (G_OBJECT (priv->mixer_sinkb), "operator",
priv->type ==
GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE ? "add" : "over");
is_fade ? "add" : "over");
return TRUE;
}