mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Make it so core elements can be re added to their 'owners'

Browse source 
The user might want to add/remove/add core children to clips and be able
to regroup ungrouped clip. This is needed for undo/redo in Pitivi for
example
This commit is contained in:
Thibault Saunier 2020-03-18 12:56:06 -03:00
parent 10590e25f0
commit fc0333922f
6 changed files with 122 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
ges/ges-clip.c
View file

@ -195,7 +195,7 @@ _child_inpoint_changed_cb (GESTimelineElement * child, GParamSpec * pspec,
return;
/* ignore non-core */
if (!ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE))
if (!ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
return;
/* if the track element has no internal content, then this means its
@ -223,7 +223,7 @@ _update_max_duration (GESContainer * container)
for (tmp = container->children; tmp; tmp = tmp->next) {
GESTimelineElement *child = tmp->data;
if (ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE)
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child))
&& GST_CLOCK_TIME_IS_VALID (child->maxduration))
min = GST_CLOCK_TIME_IS_VALID (min) ? MIN (min, child->maxduration) :
child->maxduration;
@ -238,7 +238,7 @@ _child_max_duration_changed_cb (GESTimelineElement * child,
GParamSpec * pspec, GESContainer * container)
{
/* ignore non-core */
if (!ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE))
if (!ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
return;
_update_max_duration (container);
@ -249,7 +249,7 @@ _child_has_internal_source_changed_cb (GESTimelineElement * child,
GParamSpec * pspec, GESContainer * container)
{
/* ignore non-core */
if (!ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE))
if (!ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
return;
/* if the track element is now registered to have no internal content,
@ -305,13 +305,13 @@ ges_clip_can_set_inpoint_of_child (GESClip * clip, GESTimelineElement * child,
return TRUE;
/* non-core children do not effect our in-point */
if (!ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE))
if (!ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
return TRUE;
for (tmp = GES_CONTAINER_CHILDREN (clip); tmp; tmp = tmp->next) {
GESTimelineElement *child = tmp->data;
if (ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE)
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child))
&& ges_track_element_has_internal_source (GES_TRACK_ELEMENT (child))) {
if (GST_CLOCK_TIME_IS_VALID (child->maxduration)
&& child->maxduration < inpoint)
@ -333,7 +333,7 @@ _set_childrens_inpoint (GESTimelineElement * element, GstClockTime inpoint,
for (tmp = GES_CONTAINER_CHILDREN (element); tmp; tmp = tmp->next) {
GESTimelineElement *child = tmp->data;
if (ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE)
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child))
&& ges_track_element_has_internal_source (GES_TRACK_ELEMENT (child))) {
if (!_set_inpoint0 (child, inpoint)) {
GST_ERROR_OBJECT ("Could not set the in-point of child %"
@ -401,7 +401,7 @@ _set_max_duration (GESTimelineElement * element, GstClockTime maxduration)
for (tmp = GES_CONTAINER_CHILDREN (element); tmp; tmp = tmp->next) {
GESTimelineElement *child = tmp->data;
if (ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE)
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child))
&& ges_track_element_has_internal_source (GES_TRACK_ELEMENT (child))) {
if (!ges_timeline_element_set_max_duration (child, maxduration)) {
GST_ERROR_OBJECT ("Could not set the max-duration of child %"
@ -535,6 +535,7 @@ _add_child (GESContainer * container, GESTimelineElement * element)
GESClipClass *klass = GES_CLIP_GET_CLASS (GES_CLIP (container));
guint max_prio, min_prio;
GESClipPrivate *priv = GES_CLIP (container)->priv;
GList *child_core_owners;
g_return_val_if_fail (GES_IS_TRACK_ELEMENT (element), FALSE);
@ -547,11 +548,19 @@ _add_child (GESContainer * container, GESTimelineElement * element)
return FALSE;
}
child_core_owners =
ges_track_element_get_owners (GES_TRACK_ELEMENT (element));
if (child_core_owners
&& !g_list_find (child_core_owners, GES_CLIP (container))) {
GST_WARNING_OBJECT (container,
"Can not add child %" GES_FORMAT " because we are not in it core owner"
" element list", GES_ARGS (element));
return FALSE;
}
/* NOTE: notifies are currently frozen by ges_container_add */
_get_priority_range (container, &min_prio, &max_prio);
if (ELEMENT_FLAG_IS_SET (element, GES_TRACK_ELEMENT_IS_CORE)) {
/* NOTE: we are assuming that the core element is **our** core element
* and not from another clip. */
if (child_core_owners) {
/* NOTE: Core track elements that are base effects are added like any
* other core clip. In particular, they are *not* added to the list of
* added effects, so we don not increase nb_effects. */
@ -572,8 +581,8 @@ _add_child (GESContainer * container, GESTimelineElement * element)
/* Always add at the same priority, on top of existing effects */
_set_priority0 (element, min_prio + priv->nb_effects);
} else if (GES_CLIP_CLASS_CAN_ADD_EFFECTS (klass)
&& GES_IS_BASE_EFFECT (element)) {
} else if (GES_CLIP_CLASS_CAN_ADD_EFFECTS (klass) &&
GES_IS_BASE_EFFECT (element)) {
GList *tmp;
/* Add the effect at the lowest priority among effects (just after
* the core elements). Need to shift the core elements up by 1
@ -626,7 +635,7 @@ _remove_child (GESContainer * container, GESTimelineElement * element)
GESClipPrivate *priv = GES_CLIP (container)->priv;
/* NOTE: notifies are currently frozen by ges_container_add */
if (!ELEMENT_FLAG_IS_SET (element, GES_TRACK_ELEMENT_IS_CORE)
if (!ges_track_element_get_owners (GES_TRACK_ELEMENT (element))
&& GES_IS_BASE_EFFECT (element)) {
GList *tmp;
GST_DEBUG_OBJECT (container, "Resyncing effects priority.");
@ -646,12 +655,8 @@ _remove_child (GESContainer * container, GESTimelineElement * element)
/* height may have changed */
_compute_height (container);
}
if (ELEMENT_FLAG_IS_SET (element, GES_TRACK_ELEMENT_IS_CORE)) {
/* When removed, the child is no longer considered a core element.
* This prevents the user from being able to add the removed track
* element to an arbitrary clip */
ELEMENT_UNSET_FLAG (element, GES_TRACK_ELEMENT_IS_CORE);
}
/* Core owner is not reset so that the child can be readded here in @container
* but not in any other clip by the end user */
return TRUE;
}
@ -696,15 +701,14 @@ static void
_transfer_child (GESClip * from_clip, GESClip * to_clip,
GESTrackElement * child)
{
gboolean is_core;
/* We need to bump the refcount to avoid the object to be destroyed */
gst_object_ref (child);
/* IS_CORE flag is removed when an element is removed from its clip */
is_core = ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE);
ges_container_remove (GES_CONTAINER (from_clip),
GES_TIMELINE_ELEMENT (child));
if (is_core)
ELEMENT_SET_FLAG (child, GES_TRACK_ELEMENT_IS_CORE);
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
ges_track_element_add_owner (GES_TRACK_ELEMENT (child), to_clip);
ges_container_add (GES_CONTAINER (to_clip), GES_TIMELINE_ELEMENT (child));
gst_object_unref (child);
}
@ -828,7 +832,7 @@ _group (GList * containers)
inpoint != _INPOINT (tmpcontainer) ||
duration != _DURATION (tmpcontainer) || clip->priv->layer != layer) {
GST_INFO ("All children must have the same start, inpoint, duration "
" and be in the same layer");
"and be in the same layer");
goto done;
} else {
@ -929,7 +933,11 @@ _deep_copy (GESTimelineElement * element, GESTimelineElement * copy)
for (tmp = GES_CONTAINER_CHILDREN (element); tmp; tmp = tmp->next) {
el = GES_TRACK_ELEMENT (tmp->data);
/* copies the children properties */
el_copy = ges_track_element_copy_core (el, TRUE);
el_copy = GES_TRACK_ELEMENT (ges_timeline_element_copy (tmp->data, TRUE));
if (ges_track_element_get_owners (el))
ges_track_element_add_owner (el_copy, ccopy);
ges_track_element_copy_bindings (el, el_copy, GST_CLOCK_TIME_NONE);
ccopy->priv->copied_track_elements =
g_list_append (ccopy->priv->copied_track_elements, el_copy);
@ -958,12 +966,16 @@ _paste (GESTimelineElement * element, GESTimelineElement * ref,
* ges_track_element_copy_properties explicitly, which is the
* deep_copy for the GESTrackElementClass. */
new_trackelement =
GES_TRACK_ELEMENT (ges_track_element_copy_core (trackelement, FALSE));
GES_TRACK_ELEMENT (ges_timeline_element_copy (GES_TIMELINE_ELEMENT
(trackelement), FALSE));
if (new_trackelement == NULL) {
GST_WARNING_OBJECT (trackelement, "Could not create a copy");
continue;
}
if (ges_track_element_get_owners (trackelement))
ges_track_element_add_owner (new_trackelement, nclip);
ges_container_add (GES_CONTAINER (nclip),
GES_TIMELINE_ELEMENT (new_trackelement));
@ -1219,16 +1231,11 @@ ges_clip_create_track_elements (GESClip * clip, GESTrackType type)
if (!ges_track_element_get_track (child)
&& ges_track_element_get_track_type (child) & type) {
gboolean is_core = ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE);
GST_DEBUG_OBJECT (clip, "Removing for reusage: %" GST_PTR_FORMAT, child);
result = g_list_append (result, g_object_ref (child));
ges_container_remove (GES_CONTAINER (clip), tmp->data);
if (is_core) {
/* set on child since the flag is removed when removed from the clip */
ELEMENT_SET_FLAG (child, GES_TRACK_ELEMENT_IS_CORE);
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
readding_effects_only = FALSE;
}
}
}
g_list_free_full (children, gst_object_unref);
@ -1265,10 +1272,8 @@ ges_clip_create_track_elements (GESClip * clip, GESTrackType type)
*/
if (readding_effects_only) {
GList *track_elements = klass->create_track_elements (clip, type);
for (tmp = track_elements; tmp; tmp = tmp->next) {
GESTimelineElement *elem = tmp->data;
ELEMENT_SET_FLAG (elem, GES_TRACK_ELEMENT_IS_CORE);
}
for (tmp = track_elements; tmp; tmp = tmp->next)
ges_track_element_add_owner (tmp->data, clip);
result = g_list_concat (track_elements, result);
}
@ -1514,7 +1519,7 @@ ges_clip_get_top_effects (GESClip * clip)
for (tmp = GES_CONTAINER_CHILDREN (clip); tmp; tmp = tmp->next) {
child = tmp->data;
if (GES_IS_BASE_EFFECT (child)
&& !ELEMENT_FLAG_IS_SET (child, GES_TRACK_ELEMENT_IS_CORE))
&& !ges_track_element_get_owners (GES_TRACK_ELEMENT (child)))
ret = g_list_append (ret, gst_object_ref (child));
}
@ -1531,7 +1536,7 @@ _is_added_effect (GESClip * clip, GESBaseEffect * effect)
" doe not belong to this clip", GES_ARGS (effect));
return FALSE;
}
if (ELEMENT_FLAG_IS_SET (effect, GES_TRACK_ELEMENT_IS_CORE)) {
if (ges_track_element_get_owners (GES_TRACK_ELEMENT (effect))) {
GST_WARNING_OBJECT (clip, "The effect %" GES_FORMAT " is not a top "
"effect of this clip (it is a core element of the clip)",
GES_ARGS (effect));
@ -1778,12 +1783,17 @@ ges_clip_split (GESClip * clip, guint64 position)
GESTrackElement *new_trackelement, *trackelement =
GES_TRACK_ELEMENT (tmp->data);
new_trackelement = ges_track_element_copy_core (trackelement, FALSE);
new_trackelement =
GES_TRACK_ELEMENT (ges_timeline_element_copy (GES_TIMELINE_ELEMENT
(trackelement), FALSE));
if (new_trackelement == NULL) {
GST_WARNING_OBJECT (trackelement, "Could not create a copy");
continue;
}
if (ges_track_element_get_owners (trackelement))
ges_track_element_add_owner (new_trackelement, new_object);
/* FIXME: in-point for non-core track elements should be shifted by
* the split (adding them to the new clip will not set their in-point)
* Handle this once generic time effects are supported in splitting */

7
ges/ges-internal.h
View file

@ -413,8 +413,11 @@ G_GNUC_INTERNAL void ges_track_element_copy_properties (GESTimelineElem
G_GNUC_INTERNAL void ges_track_element_copy_bindings (GESTrackElement *element,
GESTrackElement *new_element,
guint64 position);
G_GNUC_INTERNAL GESTrackElement * ges_track_element_copy_core (GESTrackElement * self,
gboolean deep);
G_GNUC_INTERNAL void ges_track_element_add_owner (GESTrackElement * self,
GESClip * owner);
/* NOTE: Returned elements in list are only valid for **pointer comparison** */
G_GNUC_INTERNAL GList * ges_track_element_get_owners (GESTrackElement *self);
G_GNUC_INTERNAL GstElement* ges_source_create_topbin(const gchar* bin_name, GstElement* sub_element, GPtrArray* elements);
G_GNUC_INTERNAL void ges_track_set_caps(GESTrack* track,

6
ges/ges-timeline.c
View file

@ -1433,7 +1433,11 @@ clip_track_element_added_cb (GESClip * clip,
/* FIXME: in both cases track_element is removed from the clip! */
g_clear_object (&existing_src);
track_element_copy = ges_track_element_copy_core (track_element, TRUE);
track_element_copy =
GES_TRACK_ELEMENT (ges_timeline_element_copy (GES_TIMELINE_ELEMENT
(track_element), FALSE));
if (ges_track_element_get_owners (track_element))
ges_track_element_add_owner (track_element_copy, clip);
GST_LOG_OBJECT (timeline, "Trying to add %p to track %p",
track_element_copy, track);

42
ges/ges-track-element.c
View file

@ -66,6 +66,7 @@ struct _GESTrackElementPrivate
GHashTable *bindings_hashtable; /* We need this if we want to be able to serialize
and deserialize keyframes */
GList *valid_owners;
};
enum
@ -224,6 +225,26 @@ ges_track_element_dispose (GObject * object)
G_OBJECT_CLASS (ges_track_element_parent_class)->dispose (object);
}
static void
owner_disposed (GESTrackElement * self, GObject * owner)
{
self->priv->valid_owners = g_list_remove (self->priv->valid_owners, owner);
}
static void
ges_track_element_finalize (GObject * object)
{
GESTrackElement *self = GES_TRACK_ELEMENT (object);
GList *tmp;
for (tmp = self->priv->valid_owners; tmp; tmp = tmp->next)
g_object_weak_unref (tmp->data, (GWeakNotify) owner_disposed, self);
g_list_free (self->priv->valid_owners);
G_OBJECT_CLASS (ges_track_element_parent_class)->finalize (object);
}
static void
ges_track_element_constructed (GObject * gobject)
{
@ -287,6 +308,7 @@ ges_track_element_class_init (GESTrackElementClass * klass)
object_class->get_property = ges_track_element_get_property;
object_class->set_property = ges_track_element_set_property;
object_class->dispose = ges_track_element_dispose;
object_class->finalize = ges_track_element_finalize;
object_class->constructed = ges_track_element_constructed;
@ -1403,17 +1425,17 @@ ges_track_element_copy_properties (GESTimelineElement * element,
g_free (specs);
}
/* copy an element, as well as its GES_TRACK_ELEMENT_IS_CORE flag */
GESTrackElement *
ges_track_element_copy_core (GESTrackElement * self, gboolean deep)
void
ges_track_element_add_owner (GESTrackElement * self, GESClip * owner)
{
GESTimelineElement *copy =
ges_timeline_element_copy (GES_TIMELINE_ELEMENT (self), deep);
if (!copy)
return NULL;
if (ELEMENT_FLAG_IS_SET (self, GES_TRACK_ELEMENT_IS_CORE))
ELEMENT_SET_FLAG (copy, GES_TRACK_ELEMENT_IS_CORE);
return GES_TRACK_ELEMENT (copy);
self->priv->valid_owners = g_list_prepend (self->priv->valid_owners, owner);
g_object_weak_ref (G_OBJECT (owner), (GWeakNotify) owner_disposed, self);
}
GList *
ges_track_element_get_owners (GESTrackElement * self)
{
return self->priv->valid_owners;
}
static void

BIN
tests/check/assets/30frames.ogv Normal file
View file

Binary file not shown.

30
tests/check/python/test_clip.py
View file

@ -143,7 +143,7 @@ class TestTitleClip(unittest.TestCase):
children2[1].props.priority)
class TestTrackElements(common.GESTest):
class TestTrackElements(common.GESSimpleTimelineTest):
def test_add_to_layer_with_effect_remove_add(self):
timeline = GES.Timeline.new_audio_video()
@ -240,3 +240,31 @@ class TestTrackElements(common.GESTest):
mainloop.run(until_empty=True)
self.assertEqual(signals, ["child-removed", "notify::priority"])
def test_moving_core_track_elements(self):
clip = self.append_clip()
clip1 = self.append_clip()
track_element = clip.find_track_element(None, GES.VideoSource)
self.assertTrue(clip.remove(track_element))
track_element1 = clip1.find_track_element(None, GES.VideoSource)
self.assertTrue(clip1.remove(track_element1))
self.assertFalse(clip1.add(track_element))
self.assertFalse(clip.add(track_element1))
self.assertTrue(clip.add(track_element))
self.assertTrue(clip1.add(track_element1))
def test_ungroup_regroup(self):
clip = self.append_clip()
clip1, clip2 = GES.Container.ungroup(clip, True)
self.assertEqual(clip, clip1)
clip2_child, = clip2.get_children(True)
self.assertTrue(clip2.remove(clip2_child))
self.assertTrue(self.layer.remove_clip(clip2))
self.assertTrue(clip1.add(clip2_child))