From: Thiago Santos <thiago.sousa.santos@collabora.com>
Date: Thu, 16 Feb 2012 04:12:58 +0000 (-0300)
Subject: wrappercamerabinsrc: Put source in NULL when it fails changing state
X-Git-Tag: 1.19.3~507^2~15775^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ce709cf4a4d46b058218a965885cecfa1568b1f;p=platform%2Fupstream%2Fgstreamer.git

wrappercamerabinsrc: Put source in NULL when it fails changing state

When source is being reset to change caps, check the return of
the state syncing function to avoid leaving the source in an
unconsistent state.
---

diff --git a/gst/camerabin2/gstwrappercamerabinsrc.c b/gst/camerabin2/gstwrappercamerabinsrc.c
index 2b45342550..944cd2c2ed 100644
--- a/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -162,7 +162,10 @@ gst_wrapper_camera_bin_reset_video_src_caps (GstWrapperCameraBinSrc * self,
     self->drop_newseg = TRUE;
 
     GST_DEBUG_OBJECT (self, "Bringing source up");
-    gst_element_sync_state_with_parent (self->src_vid_src);
+    if (!gst_element_sync_state_with_parent (self->src_vid_src)) {
+      GST_WARNING_OBJECT (self, "Failed to reset source caps");
+      gst_element_set_state (self->src_vid_src, GST_STATE_NULL);
+    }
 
     if (clock) {
       gst_element_set_clock (self->src_vid_src, clock);