From: Andrey Kamaev Date: Tue, 26 Mar 2013 08:27:39 +0000 (+0400) Subject: Fix build with gstreamer 0.10.28 X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1110^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6377922716f37b00e4f8f5eab87a8fbcb16422e5;p=profile%2Fivi%2Fopencv.git Fix build with gstreamer 0.10.28 --- diff --git a/modules/highgui/src/cap_gstreamer.cpp b/modules/highgui/src/cap_gstreamer.cpp index 9ef0a3f..b8c7f4f 100644 --- a/modules/highgui/src/cap_gstreamer.cpp +++ b/modules/highgui/src/cap_gstreamer.cpp @@ -56,9 +56,15 @@ #include #include #include -#include #include + +#define VERSION_NUM(major, minor, micro) (major * 1000000 + minor * 1000 + micro) +#define FULL_GST_VERSION VERSION_NUM(GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO) + +#if FULL_GST_VERSION >= VERSION_NUM(0,10,32) +#include //#include +#endif #ifdef NDEBUG @@ -1114,9 +1120,12 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc, GstCaps* caps = NULL; GstCaps* videocaps = NULL; + +#if FULL_GST_VERSION >= VERSION_NUM(0,10,32) GstCaps* containercaps = NULL; GstEncodingContainerProfile* containerprofile = NULL; GstEncodingVideoProfile* videoprofile = NULL; +#endif #if GST_VERSION_MAJOR == 0 GstIterator *it = NULL; @@ -1178,16 +1187,21 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc, if (!mime) { CV_ERROR( CV_StsUnsupportedFormat, "Gstreamer Opencv backend does not support this file type."); } + +#if FULL_GST_VERSION >= VERSION_NUM(0,10,32) containercaps = gst_caps_from_string(mime); //create encodebin profile containerprofile = gst_encoding_container_profile_new("container", "container", containercaps, NULL); videoprofile = gst_encoding_video_profile_new(videocaps, NULL, NULL, 1); gst_encoding_container_profile_add_profile(containerprofile, (GstEncodingProfile *) videoprofile); +#endif //create pipeline elements encodebin = gst_element_factory_make("encodebin", NULL); +#if FULL_GST_VERSION >= VERSION_NUM(0,10,32) g_object_set(G_OBJECT(encodebin), "profile", containerprofile, NULL); +#endif source = gst_element_factory_make("appsrc", NULL); file = gst_element_factory_make("filesink", NULL); g_object_set(G_OBJECT(file), "location", filename, NULL); @@ -1218,6 +1232,7 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc, } else { +#if FULL_GST_VERSION >= VERSION_NUM(0,10,29) input_pix_fmt = GST_VIDEO_FORMAT_GRAY8; bufsize = frameSize.width * frameSize.height; @@ -1236,6 +1251,9 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc, NULL); caps = gst_caps_fixate(caps); #endif +#else + CV_Assert(!"Gstreamer 0.10.29 or newer is required for grayscale input"); +#endif } gst_app_src_set_caps(GST_APP_SRC(source), caps); @@ -1296,11 +1314,13 @@ bool CvVideoWriter_GStreamer::writeFrame( const IplImage * image ) CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U and nChannels = 3."); } } +#if FULL_GST_VERSION >= VERSION_NUM(0,10,29) else if (input_pix_fmt == GST_VIDEO_FORMAT_GRAY8) { if (image->nChannels != 1 || image->depth != IPL_DEPTH_8U) { CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U and nChannels = 1."); } } +#endif else { assert(false); }