mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1003 from vhdirk:gstreamerfixes

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-14 15:51:03 +04:00 committed by OpenCV Buildbot
commit 4bc4f4aa1f
1 changed files with 71 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,17 +651,47 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
if(manualpipeline) if(manualpipeline)
{ {
GstIterator *it = NULL;
#if GST_VERSION_MAJOR == 0 #if GST_VERSION_MAJOR == 0
GstIterator *it = gst_bin_iterate_sinks(GST_BIN(uridecodebin)); it = gst_bin_iterate_sinks(GST_BIN(uridecodebin));
if(gst_iterator_next(it, (gpointer *)&sink) != GST_ITERATOR_OK) { if(gst_iterator_next(it, (gpointer *)&sink) != GST_ITERATOR_OK) {
CV_ERROR(CV_StsError, "GStreamer: cannot find appsink in manual pipeline\n"); CV_ERROR(CV_StsError, "GStreamer: cannot find appsink in manual pipeline\n");
return false; return false;
} }
#else #else
sink = gst_bin_get_by_name(GST_BIN(uridecodebin), "opencvsink"); it = gst_bin_iterate_sinks (GST_BIN(uridecodebin));
if (!sink){
sink = gst_bin_get_by_name(GST_BIN(uridecodebin), "appsink0"); gboolean done = FALSE;
GstElement *element = NULL;
gchar* name = NULL;
GValue value = G_VALUE_INIT;
while (!done) {
switch (gst_iterator_next (it, &value)) {
case GST_ITERATOR_OK:
element = GST_ELEMENT (g_value_get_object (&value));
name = gst_element_get_name(element);
if (name){
if(strstr(name, "opencvsink") != NULL || strstr(name, "appsink") != NULL) {
sink = GST_ELEMENT ( gst_object_ref (element) );
done = TRUE;
}
g_free(name);
}
g_value_unset (&value);
break;
case GST_ITERATOR_RESYNC:
gst_iterator_resync (it);
break;
case GST_ITERATOR_ERROR:
case GST_ITERATOR_DONE:
done = TRUE;
break;
}
} }
gst_iterator_free (it);
if (!sink){ if (!sink){
CV_ERROR(CV_StsError, "GStreamer: cannot find appsink in manual pipeline\n"); CV_ERROR(CV_StsError, "GStreamer: cannot find appsink in manual pipeline\n");
@ -1030,6 +1060,12 @@ void CvVideoWriter_GStreamer::close()
handleMessage(pipeline); handleMessage(pipeline);
gst_object_unref (GST_OBJECT (pipeline)); gst_object_unref (GST_OBJECT (pipeline));
if (source)
gst_object_unref (GST_OBJECT (source));
if (file)
gst_object_unref (GST_OBJECT (file));
} }
} }
@ -1127,9 +1163,7 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc,
GstEncodingVideoProfile* videoprofile = NULL; GstEncodingVideoProfile* videoprofile = NULL;
#endif #endif
#if GST_VERSION_MAJOR == 0
GstIterator *it = NULL; GstIterator *it = NULL;
#endif
// we first try to construct a pipeline from the given string. // we first try to construct a pipeline from the given string.
// if that fails, we assume it is an ordinary filename // if that fails, we assume it is an ordinary filename
@ -1150,10 +1184,38 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc,
return false; return false;
} }
#else #else
source = gst_bin_get_by_name(GST_BIN(encodebin), "opencvsrc"); it = gst_bin_iterate_sources (GST_BIN(encodebin));
if (!source){
source = gst_bin_get_by_name(GST_BIN(encodebin), "appsrc0"); gboolean done = FALSE;
GstElement *element = NULL;
gchar* name = NULL;
GValue value = G_VALUE_INIT;
while (!done) {
switch (gst_iterator_next (it, &value)) {
case GST_ITERATOR_OK:
element = GST_ELEMENT (g_value_get_object (&value));
name = gst_element_get_name(element);
if (name){
if(strstr(name, "opencvsrc") != NULL || strstr(name, "appsrc") != NULL) {
source = GST_ELEMENT ( gst_object_ref (element) );
done = TRUE;
}
g_free(name);
}
g_value_unset (&value);
break;
case GST_ITERATOR_RESYNC:
gst_iterator_resync (it);
break;
case GST_ITERATOR_ERROR:
case GST_ITERATOR_DONE:
done = TRUE;
break;
}
} }
gst_iterator_free (it);
if (!source){ if (!source){
CV_ERROR(CV_StsError, "GStreamer: cannot find appsrc in manual pipeline\n"); CV_ERROR(CV_StsError, "GStreamer: cannot find appsrc in manual pipeline\n");