Merge pull request opencv#9892 from terfendail:v4l_custom

vpisarev · vpisarev · commit 8b1b126e3e26 · 2017-10-27T11:57:18.000Z
diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp
@@ -1636,7 +1636,7 @@ static double icvGetPropertyCAM_V4L (const CvCaptureCAM_V4L* capture,
       case CV_CAP_PROP_MODE:
           return capture->palette;
       case CV_CAP_PROP_FORMAT:
-          return CV_MAKETYPE(CV_8U, capture->frame.nChannels);
+          return CV_MAKETYPE(IPL2CV_DEPTH(capture->frame.depth), capture->frame.nChannels);
       case CV_CAP_PROP_CONVERT_RGB:
           return capture->convert_rgb;
       }

Original file line number	Diff line number	Diff line change
`@@ -1636,7 +1636,7 @@ static double icvGetPropertyCAM_V4L (const CvCaptureCAM_V4L* capture,`
`1636`	`1636`	`case CV_CAP_PROP_MODE:`
`1637`	`1637`	`return capture->palette;`
`1638`	`1638`	`case CV_CAP_PROP_FORMAT:`
`1639`		`- return CV_MAKETYPE(CV_8U, capture->frame.nChannels);`
	`1639`	`+ return CV_MAKETYPE(IPL2CV_DEPTH(capture->frame.depth), capture->frame.nChannels);`
`1640`	`1640`	`case CV_CAP_PROP_CONVERT_RGB:`
`1641`	`1641`	`return capture->convert_rgb;`
`1642`	`1642`	`}`