From e2adbda766f5fbdc6238cbd6bc64a6d3383c844e Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 6 Sep 2016 16:57:09 +0200 Subject: DirectShow: support MJPEG cameras Map MEDIASUBTYPE_MJPG to QVideoFrame::Format_Jpeg, which makes sure that cameras that only support MJPEG are configured properly. Task-number: QTBUG-55359 Change-Id: I732c56afc51109aba0231c8537f795e8d276c194 Reviewed-by: Christian Stromme --- src/plugins/directshow/camera/dscamerasession.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/directshow/camera') diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 1cb91cd4a..5df2d2fb3 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -168,6 +168,8 @@ QVideoFrame::PixelFormat pixelFormatFromMediaSubtype(GUID uid) return QVideoFrame::Format_YUYV; else if (uid == MEDIASUBTYPE_NV12) return QVideoFrame::Format_NV12; + else if (uid == MEDIASUBTYPE_MJPG) + return QVideoFrame::Format_Jpeg; else if (uid == MEDIASUBTYPE_IMC1) return QVideoFrame::Format_IMC1; else if (uid == MEDIASUBTYPE_IMC2) -- cgit v1.2.3