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

fixing gstreamer cap

Browse Source
This commit is contained in:
StevenPuttemans 2016-04-14 13:11:26 +02:00
parent fc5e32c7ac
commit 88c0d64b4e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/cap_gstreamer.cpp
View File

@ -1416,8 +1416,8 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc,
if (fourcc == CV_FOURCC('M','J','P','G') && frameSize.height == 1) if (fourcc == CV_FOURCC('M','J','P','G') && frameSize.height == 1)
{ {
input_pix_fmt = GST_VIDEO_FORMAT_ENCODED;
#if GST_VERSION_MAJOR > 0 #if GST_VERSION_MAJOR > 0
input_pix_fmt = GST_VIDEO_FORMAT_ENCODED;
caps = gst_caps_new_simple("image/jpeg", caps = gst_caps_new_simple("image/jpeg",
"framerate", GST_TYPE_FRACTION, int(fps), 1, "framerate", GST_TYPE_FRACTION, int(fps), 1,
NULL); NULL);
@ -1587,12 +1587,15 @@ bool CvVideoWriter_GStreamer::writeFrame( const IplImage * image )
handleMessage(pipeline); handleMessage(pipeline);
#if GST_VERSION_MAJOR > 0
if (input_pix_fmt == GST_VIDEO_FORMAT_ENCODED) { if (input_pix_fmt == GST_VIDEO_FORMAT_ENCODED) {
if (image->nChannels != 1 || image->depth != IPL_DEPTH_8U || image->height != 1) { 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."); 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) { if (image->nChannels != 3 || image->depth != IPL_DEPTH_8U) {
CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U and nChannels = 3."); CV_ERROR(CV_StsUnsupportedFormat, "cvWriteFrame() needs images with depth = IPL_DEPTH_8U and nChannels = 3.");
} }