From 88c0d64b4e58bca19c10c63aa26695189a21f504 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Thu, 14 Apr 2016 13:11:26 +0200 Subject: [PATCH] fixing gstreamer cap --- modules/videoio/src/cap_gstreamer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/videoio/src/cap_gstreamer.cpp b/modules/videoio/src/cap_gstreamer.cpp index 173079423..552c1cb2c 100644 --- a/modules/videoio/src/cap_gstreamer.cpp +++ b/modules/videoio/src/cap_gstreamer.cpp @@ -1416,8 +1416,8 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc, if (fourcc == CV_FOURCC('M','J','P','G') && frameSize.height == 1) { - input_pix_fmt = GST_VIDEO_FORMAT_ENCODED; #if GST_VERSION_MAJOR > 0 + input_pix_fmt = GST_VIDEO_FORMAT_ENCODED; caps = gst_caps_new_simple("image/jpeg", "framerate", GST_TYPE_FRACTION, int(fps), 1, NULL); @@ -1587,12 +1587,15 @@ bool CvVideoWriter_GStreamer::writeFrame( const IplImage * image ) handleMessage(pipeline); +#if GST_VERSION_MAJOR > 0 if (input_pix_fmt == GST_VIDEO_FORMAT_ENCODED) { if (image->nChannels != 1 || image->depth != IPL_DEPTH_8U || image->height != 1) { CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U, nChannels = 1 and height = 1."); } } - else if(input_pix_fmt == GST_VIDEO_FORMAT_BGR) { + else +#endif + if(input_pix_fmt == GST_VIDEO_FORMAT_BGR) { if (image->nChannels != 3 || image->depth != IPL_DEPTH_8U) { CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U and nChannels = 3."); }