mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

capsfilter: Only remember previous filter caps if they were actually used for something

Browse source 
If nobody ever saw the previous filter caps, nothing could've negotiated with
them and we can just pretend they never existed at all.
This commit is contained in:
Sebastian Dröge 2015-07-28 12:19:04 +03:00
parent 4e2eb93f04
commit a30c4cf721
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/elements/gstcapsfilter.c
View file

@ -168,6 +168,7 @@ gst_capsfilter_init (GstCapsFilter * filter)
gst_base_transform_set_gap_aware (trans, TRUE); gst_base_transform_set_gap_aware (trans, TRUE);
gst_base_transform_set_prefer_passthrough (trans, FALSE); gst_base_transform_set_prefer_passthrough (trans, FALSE);
filter->filter_caps = gst_caps_new_any (); filter->filter_caps = gst_caps_new_any ();
filter->filter_caps_used = FALSE;
filter->caps_change_mode = DEFAULT_CAPS_CHANGE_MODE; filter->caps_change_mode = DEFAULT_CAPS_CHANGE_MODE;
} }
@ -193,8 +194,8 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
GST_OBJECT_LOCK (capsfilter); GST_OBJECT_LOCK (capsfilter);
old_caps = capsfilter->filter_caps; old_caps = capsfilter->filter_caps;
capsfilter->filter_caps = new_caps; capsfilter->filter_caps = new_caps;
if (old_caps if (old_caps && capsfilter->filter_caps_used &&
&& capsfilter->caps_change_mode == capsfilter->caps_change_mode ==
GST_CAPS_FILTER_CAPS_CHANGE_MODE_DELAYED) { GST_CAPS_FILTER_CAPS_CHANGE_MODE_DELAYED) {
capsfilter->previous_caps = capsfilter->previous_caps =
g_list_prepend (capsfilter->previous_caps, gst_caps_ref (old_caps)); g_list_prepend (capsfilter->previous_caps, gst_caps_ref (old_caps));
@ -204,6 +205,7 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
(GDestroyNotify) gst_caps_unref); (GDestroyNotify) gst_caps_unref);
capsfilter->previous_caps = NULL; capsfilter->previous_caps = NULL;
} }
capsfilter->filter_caps_used = FALSE;
GST_OBJECT_UNLOCK (capsfilter); GST_OBJECT_UNLOCK (capsfilter);
gst_caps_unref (old_caps); gst_caps_unref (old_caps);
@ -278,6 +280,7 @@ gst_capsfilter_transform_caps (GstBaseTransform * base,
GST_OBJECT_LOCK (capsfilter); GST_OBJECT_LOCK (capsfilter);
filter_caps = gst_caps_ref (capsfilter->filter_caps); filter_caps = gst_caps_ref (capsfilter->filter_caps);
capsfilter->filter_caps_used = TRUE;
caps_change_mode = capsfilter->caps_change_mode; caps_change_mode = capsfilter->caps_change_mode;
GST_OBJECT_UNLOCK (capsfilter); GST_OBJECT_UNLOCK (capsfilter);
@ -332,6 +335,7 @@ gst_capsfilter_accept_caps (GstBaseTransform * base,
GST_OBJECT_LOCK (capsfilter); GST_OBJECT_LOCK (capsfilter);
filter_caps = gst_caps_ref (capsfilter->filter_caps); filter_caps = gst_caps_ref (capsfilter->filter_caps);
capsfilter->filter_caps_used = TRUE;
GST_OBJECT_UNLOCK (capsfilter); GST_OBJECT_UNLOCK (capsfilter);
ret = gst_caps_can_intersect (caps, filter_caps); ret = gst_caps_can_intersect (caps, filter_caps);
@ -555,6 +559,7 @@ done:
if (!l && gst_caps_can_intersect (caps, filter->filter_caps)) { if (!l && gst_caps_can_intersect (caps, filter->filter_caps)) {
g_list_free_full (filter->previous_caps, (GDestroyNotify) gst_caps_unref); g_list_free_full (filter->previous_caps, (GDestroyNotify) gst_caps_unref);
filter->previous_caps = NULL; filter->previous_caps = NULL;
filter->filter_caps_used = TRUE;
} }
GST_OBJECT_UNLOCK (filter); GST_OBJECT_UNLOCK (filter);
} }

1
plugins/elements/gstcapsfilter.h
View file

@ -58,6 +58,7 @@ struct _GstCapsFilter {
GstBaseTransform trans; GstBaseTransform trans;
GstCaps *filter_caps; GstCaps *filter_caps;
gboolean filter_caps_used;
GstCapsFilterCapsChangeMode caps_change_mode; GstCapsFilterCapsChangeMode caps_change_mode;
GList *pending_events; GList *pending_events;