Enable directly writing jpeg-encoded streams with GStreamer

CvVideoWriter_GStreamer assumes a JPEG encoded stream if the height of
the given frame size is 1.
This commit is contained in:
Andreas Franek 2016-03-18 18:02:19 +01:00
parent 78286f3a44
commit 1b3a967223

View File

@ -1414,7 +1414,19 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc,
g_object_set(G_OBJECT(file), "location", filename, NULL); g_object_set(G_OBJECT(file), "location", filename, NULL);
} }
if (is_color) if (fourcc == CV_FOURCC('M','J','P','G') && frameSize.height == 1)
{
input_pix_fmt = GST_VIDEO_FORMAT_ENCODED;
#if GST_VERSION_MAJOR > 0
caps = gst_caps_new_simple("image/jpeg",
"framerate", GST_TYPE_FRACTION, int(fps), 1,
NULL);
caps = gst_caps_fixate(caps);
#else
CV_ERROR( CV_StsUnsupportedFormat, "Gstreamer 0.10 Opencv backend does not support writing encoded MJPEG data.");
#endif
}
else if(is_color)
{ {
input_pix_fmt = GST_VIDEO_FORMAT_BGR; input_pix_fmt = GST_VIDEO_FORMAT_BGR;
bufsize = frameSize.width * frameSize.height * 3; bufsize = frameSize.width * frameSize.height * 3;
@ -1575,7 +1587,12 @@ bool CvVideoWriter_GStreamer::writeFrame( const IplImage * image )
handleMessage(pipeline); handleMessage(pipeline);
if (input_pix_fmt == GST_VIDEO_FORMAT_BGR) { 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) {
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.");
} }