[opencv] 80/251: Merge pull request #8914 from stnk20:gstreamer_yuv

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 96a3c7954d1678aa8e8be2743f5c3373fa25f205
Author: Satoshi Tanaka <stnk20 at gmail.com>
Date:   Sat Jul 15 02:11:30 2017 +0900

    Merge pull request #8914 from stnk20:gstreamer_yuv
    
    Add gstreamer capture capability for some YUV formats (#8914)
    
    * Add gstreamer capture capability for some YUV formats.(only for gstreamer-1.0)
    
    * avoid cross initialization error
    
    * add checking if pipeline is manualpipeline, for compatibility.
---
 modules/videoio/src/cap_gstreamer.cpp | 38 ++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/modules/videoio/src/cap_gstreamer.cpp b/modules/videoio/src/cap_gstreamer.cpp
index 552c1cb..c44817d 100644
--- a/modules/videoio/src/cap_gstreamer.cpp
+++ b/modules/videoio/src/cap_gstreamer.cpp
@@ -287,6 +287,8 @@ IplImage * CvCapture_GStreamer::retrieveFrame(int)
         }
 
         int depth = 3;
+        bool height_extend = false;
+
 #if GST_VERSION_MAJOR > 0
         depth = 0;
         const gchar* name = gst_structure_get_name(structure);
@@ -295,9 +297,16 @@ IplImage * CvCapture_GStreamer::retrieveFrame(int)
         if (!name)
             return 0;
 
-        // we support 3 types of data:
+        // we support 11 types of data:
         //     video/x-raw, format=BGR   -> 8bit, 3 channels
         //     video/x-raw, format=GRAY8 -> 8bit, 1 channel
+        //     video/x-raw, format=UYVY  -> 8bit, 2 channel
+        //     video/x-raw, format=YUY2  -> 8bit, 2 channel
+        //     video/x-raw, format=YVYU  -> 8bit, 2 channel
+        //     video/x-raw, format=NV12  -> 8bit, 1 channel (height is 1.5x larger than true height)
+        //     video/x-raw, format=NV21  -> 8bit, 1 channel (height is 1.5x larger than true height)
+        //     video/x-raw, format=YV12  -> 8bit, 1 channel (height is 1.5x larger than true height)
+        //     video/x-raw, format=I420  -> 8bit, 1 channel (height is 1.5x larger than true height)
         //     video/x-bayer             -> 8bit, 1 channel
         //     image/jpeg                -> 8bit, mjpeg: buffer_size x 1 x 1
         // bayer data is never decoded, the user is responsible for that
@@ -311,6 +320,13 @@ IplImage * CvCapture_GStreamer::retrieveFrame(int)
             if (strcasecmp(format, "BGR") == 0) {
                 depth = 3;
             }
+            else if( (strcasecmp(format, "UYVY") == 0) || (strcasecmp(format, "YUY2") == 0) || (strcasecmp(format, "YVYU") == 0) ){
+                depth = 2;
+            }
+            else if( (strcasecmp(format, "NV12") == 0) || (strcasecmp(format, "NV21") == 0) || (strcasecmp(format, "YV12") == 0) || (strcasecmp(format, "I420") == 0) ){
+                depth = 1;
+                height_extend = true;
+            }
             else if(strcasecmp(format, "GRAY8") == 0){
                 depth = 1;
             }
@@ -324,7 +340,11 @@ IplImage * CvCapture_GStreamer::retrieveFrame(int)
         }
 #endif
         if (depth > 0) {
-            frame = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, depth);
+            if(height_extend){
+                frame = cvCreateImageHeader(cvSize(width, height*3/2), IPL_DEPTH_8U, depth);
+            }else{
+                frame = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, depth);
+            }
         } else {
             gst_caps_unref(buffer_caps);
             return 0;
@@ -810,8 +830,20 @@ bool CvCapture_GStreamer::open( int type, const char* filename )
                                "blue_mask",  G_TYPE_INT, 0xFF0000,
                                NULL);
 #else
-    // support 1 and 3 channel 8 bit data, as well as bayer (also  1 channel, 8bit)
+
     caps = gst_caps_from_string("video/x-raw, format=(string){BGR, GRAY8}; video/x-bayer,format=(string){rggb,bggr,grbg,gbrg}; image/jpeg");
+
+    if(manualpipeline){
+        GstPad* sink_pad = gst_element_get_static_pad(sink, "sink");
+        GstCaps* peer_caps = gst_pad_peer_query_caps(sink_pad,NULL);
+        if (!gst_caps_can_intersect(caps, peer_caps)) {
+            gst_caps_unref(caps);
+            caps = gst_caps_from_string("video/x-raw, format=(string){UYVY,YUY2,YVYU,NV12,NV21,YV12,I420}");
+        }
+        gst_object_unref(sink_pad);
+        gst_caps_unref(peer_caps);
+    }
+
 #endif
     gst_app_sink_set_caps(GST_APP_SINK(sink), caps);
     gst_caps_unref(caps);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git