summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qvideoframe.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2021-09-16 13:36:30 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2021-09-17 14:28:36 +0200
commitf117648a2d4f443c2bb90ff27070ae46d97a4297 (patch)
tree99c41650e0131c395b6ffc312adf71d5268ea8c7 /src/multimedia/video/qvideoframe.cpp
parentc1fdcd241896f3fdf96715b322ac5deb80a13088 (diff)
Enable OpenGL-based video on macOS
Needs its own dedicated shaders and logic because we have to deal with OpenGL textures for the GL_TEXTURE_RECTANGLE. This will currently be functional only if the core video buffer is of the type kCVPixelFormatType_32BGRA. Pick-to: 6.2 Change-Id: I006283397016bebe0b176201a39b2c69113fcd6d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/video/qvideoframe.cpp')
-rw-r--r--src/multimedia/video/qvideoframe.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 71e16162c..a3003d0c9 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -89,7 +89,9 @@ static bool pixelFormatHasAlpha[QVideoFrameFormat::NPixelFormats] =
false, //Format_P010,
false, //Format_P016,
+ false, //Format_SamplerExternalOES
false, //Format_Jpeg,
+ false, //Format_SamplerRect
};
@@ -463,6 +465,7 @@ bool QVideoFrame::map(QVideoFrame::MapMode mode)
case QVideoFrameFormat::Format_Y16:
case QVideoFrameFormat::Format_Jpeg:
case QVideoFrameFormat::Format_SamplerExternalOES:
+ case QVideoFrameFormat::Format_SamplerRect:
// Single plane or opaque format.
break;
case QVideoFrameFormat::Format_YUV420P: