From: Akihiro Tsukada <tskd2@yahoo.co.jp>
Date: Tue, 17 Apr 2012 07:54:09 +0000 (+0200)
Subject: playbin2: Don't hold the playbin lock in the autoplug-continue callback
X-Git-Tag: 1.19.3~511^2~6566
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94beeb713ae6db90b9ee4c5aad68d8ac843cc484;p=platform%2Fupstream%2Fgstreamer.git

playbin2: Don't hold the playbin lock in the autoplug-continue callback

It's not necessary there as the group lock already protects everything
we access here and causes deadlocks in some cases.

Fixes bug #673708.
---

diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 858c11a..365e138 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -3176,7 +3176,6 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
   GstElement *sink;
   GstPad *sinkpad = NULL;
 
-  GST_PLAY_BIN_LOCK (group->playbin);
   GST_SOURCE_GROUP_LOCK (group);
 
   if ((sink = group->playbin->text_sink))
@@ -3253,7 +3252,6 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
 
 done:
   GST_SOURCE_GROUP_UNLOCK (group);
-  GST_PLAY_BIN_UNLOCK (group->playbin);
 
   GST_DEBUG_OBJECT (group->playbin,
       "continue autoplugging group %p for %s:%s, %" GST_PTR_FORMAT ": %d",