generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change state of pipeline to NULL before freeing.

Browse Source
This commit is contained in:
Nils Hasler 2011-05-06 19:06:33 +00:00
parent 43f12fa96b
commit 39b79b1261
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/highgui/src/cap_gstreamer.cpp
View File

@ -278,17 +278,17 @@ void CvCapture_GStreamer::newPad(GstElement *uridecodebin,
GstPad *pad, GstPad *pad,
gpointer data) gpointer data)
{ {
GstPad *sinkpad; GstPad *sinkpad;
GstElement *color = (GstElement *) data; GstElement *color = (GstElement *) data;
sinkpad = gst_element_get_static_pad (color, "sink"); sinkpad = gst_element_get_static_pad (color, "sink");
// printf("linking dynamic pad to colourconverter %p %p\n", uridecodebin, pad); // printf("linking dynamic pad to colourconverter %p %p\n", uridecodebin, pad);
gst_pad_link (pad, sinkpad); gst_pad_link (pad, sinkpad);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
} }
bool CvCapture_GStreamer::open( int type, const char* filename ) bool CvCapture_GStreamer::open( int type, const char* filename )
@ -347,11 +347,11 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
if(!uridecodebin) { if(!uridecodebin) {
uridecodebin = gst_element_factory_make ("uridecodebin", NULL); uridecodebin = gst_element_factory_make ("uridecodebin", NULL);
g_object_set(G_OBJECT(uridecodebin),"uri",uri, NULL); g_object_set(G_OBJECT(uridecodebin),"uri",uri, NULL);
} if(!uridecodebin) {
if(!uridecodebin) { CV_WARN("GStreamer: Failed to create uridecodebin\n");
CV_WARN("GStreamer: Failed to create uridecodebin\n"); close();
close(); return false;
return false; }
} }
if(manualpipeline) { if(manualpipeline) {
@ -384,10 +384,10 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
{ {
GstCaps* caps; GstCaps* caps;
caps = gst_caps_new_simple("video/x-raw-rgb", caps = gst_caps_new_simple("video/x-raw-rgb",
"red_mask", G_TYPE_INT, 0x0000FF, "red_mask", G_TYPE_INT, 0x0000FF,
"green_mask", G_TYPE_INT, 0x00FF00, "green_mask", G_TYPE_INT, 0x00FF00,
"blue_mask", G_TYPE_INT, 0xFF0000, "blue_mask", G_TYPE_INT, 0xFF0000,
NULL); NULL);
gst_app_sink_set_caps(GST_APP_SINK(sink), caps); gst_app_sink_set_caps(GST_APP_SINK(sink), caps);
gst_caps_unref(caps); gst_caps_unref(caps);
} }
@ -401,6 +401,7 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
if(gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PLAYING) == if(gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PLAYING) ==
GST_STATE_CHANGE_FAILURE) { GST_STATE_CHANGE_FAILURE) {
gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_NULL);
CV_WARN("GStreamer: unable to set pipeline to playing\n"); CV_WARN("GStreamer: unable to set pipeline to playing\n");
gst_object_unref(pipeline); gst_object_unref(pipeline);
return false; return false;