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

resindvd: Remove caps lock from parsetter element.

Browse source 
All the members it used to protect in 0.10 are protected by
the stream lock now.
This commit is contained in:
Jan Schmidt 2012-10-02 22:20:20 +10:00
parent 6122e07795
commit 6e4a9e2e24
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/resindvd/rsnparsetter.c
View file

@ -83,8 +83,6 @@ rsn_parsetter_init (RsnParSetter * parset)
(GstPadQueryFunction) GST_DEBUG_FUNCPTR (rsn_parsetter_src_query)); (GstPadQueryFunction) GST_DEBUG_FUNCPTR (rsn_parsetter_src_query));
GST_PAD_SET_PROXY_CAPS (parset->srcpad); GST_PAD_SET_PROXY_CAPS (parset->srcpad);
gst_element_add_pad (GST_ELEMENT (parset), parset->srcpad); gst_element_add_pad (GST_ELEMENT (parset), parset->srcpad);
parset->caps_lock = g_mutex_new ();
} }
static void static void
@ -96,8 +94,6 @@ rsn_parsetter_finalize (GObject * object)
gst_caps_replace (&parset->in_caps_last, NULL); gst_caps_replace (&parset->in_caps_last, NULL);
gst_caps_replace (&parset->in_caps_converted, NULL); gst_caps_replace (&parset->in_caps_converted, NULL);
g_mutex_free (parset->caps_lock);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -131,7 +127,6 @@ rsn_parsetter_sink_event (GstPad * pad, RsnParSetter * parset, GstEvent * event)
GST_DEBUG_OBJECT (parset, "Video is %s", GST_DEBUG_OBJECT (parset, "Video is %s",
parset->is_widescreen ? "16:9" : "4:3"); parset->is_widescreen ? "16:9" : "4:3");
g_mutex_lock (parset->caps_lock);
if (parset->in_caps_last && parset->is_widescreen != is_widescreen) { if (parset->in_caps_last && parset->is_widescreen != is_widescreen) {
/* Force caps check */ /* Force caps check */
gst_caps_replace (&parset->in_caps_converted, NULL); gst_caps_replace (&parset->in_caps_converted, NULL);
@ -144,8 +139,6 @@ rsn_parsetter_sink_event (GstPad * pad, RsnParSetter * parset, GstEvent * event)
/* FIXME: Added for testing: */ /* FIXME: Added for testing: */
// parset->is_widescreen = FALSE; // parset->is_widescreen = FALSE;
g_mutex_unlock (parset->caps_lock);
if (caps_event) if (caps_event)
gst_pad_push_event (parset->srcpad, caps_event); gst_pad_push_event (parset->srcpad, caps_event);
} }
@ -217,8 +210,6 @@ rsn_parsetter_check_caps (RsnParSetter * parset, GstCaps * caps)
guint dar_n, dar_d; guint dar_n, dar_d;
gboolean ret = FALSE; gboolean ret = FALSE;
g_mutex_lock (parset->caps_lock);
if (parset->in_caps_last && if (parset->in_caps_last &&
(caps == parset->in_caps_last || (caps == parset->in_caps_last ||
gst_caps_is_equal (caps, parset->in_caps_last))) { gst_caps_is_equal (caps, parset->in_caps_last))) {
@ -260,7 +251,6 @@ rsn_parsetter_check_caps (RsnParSetter * parset, GstCaps * caps)
parset->in_caps_was_ok = ret; parset->in_caps_was_ok = ret;
out: out:
g_mutex_unlock (parset->caps_lock);
return ret; return ret;
} }
@ -276,7 +266,6 @@ rsn_parsetter_convert_caps (RsnParSetter * parset, GstCaps * caps,
guint dar_n, dar_d; guint dar_n, dar_d;
GValue par = { 0, }; GValue par = { 0, };
g_mutex_lock (parset->caps_lock);
if (caps == parset->in_caps_last && parset->in_caps_converted) { if (caps == parset->in_caps_last && parset->in_caps_converted) {
outcaps = gst_caps_ref (parset->in_caps_converted); outcaps = gst_caps_ref (parset->in_caps_converted);
goto out; goto out;
@ -312,7 +301,6 @@ rsn_parsetter_convert_caps (RsnParSetter * parset, GstCaps * caps,
gst_caps_replace (&parset->in_caps_converted, outcaps); gst_caps_replace (&parset->in_caps_converted, outcaps);
out: out:
g_mutex_unlock (parset->caps_lock);
return outcaps; return outcaps;
} }

1
ext/resindvd/rsnparsetter.h
View file

@ -34,7 +34,6 @@ struct _RsnParSetter
gboolean is_widescreen; gboolean is_widescreen;
GMutex *caps_lock;
GstCaps *in_caps_last; GstCaps *in_caps_last;
gboolean in_caps_was_ok; gboolean in_caps_was_ok;
GstCaps *in_caps_converted; GstCaps *in_caps_converted;