From: Alessandro Decina Date: Tue, 9 Mar 2010 09:27:38 +0000 (+0100) Subject: rtspmedia: emit "unprepared" if _prepare fails. X-Git-Tag: 1.19.3~495^2~1484 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f535ecf873fb4b0aafc1edd46a602ea3f521ff7;p=platform%2Fupstream%2Fgstreamer.git rtspmedia: emit "unprepared" if _prepare fails. Emit the unprepared signal if gst_rtsp_media_prepare fails so that the media object is removed from its factory's cache. --- diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index b776045..593b1d4 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -1410,16 +1410,17 @@ was_prepared: return TRUE; } /* ERRORS */ +is_reused: + { + GST_WARNING ("can not reuse media %p", media); + return FALSE; + } state_failed: { GST_WARNING ("failed to preroll pipeline"); unlock_streams (media); gst_element_set_state (media->pipeline, GST_STATE_NULL); - return FALSE; - } -is_reused: - { - GST_WARNING ("can not reuse media %p", media); + gst_rtsp_media_unprepare (media); return FALSE; } }