AVFVideo: Set color range to video frame format

Set the color range based on the pixel format.
This ensures the correct color matrix is chosen.

Task-number: QTBUG-108083
Pick-to: 6.5
Change-Id: I6b599d702384f479d8efee0673fe3eadcf9c12c2
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/plugins/multimedia/darwin/qavfhelpers.mm b/src/plugins/multimedia/darwin/qavfhelpers.mm
index c8195a81e..74d0c9b9c 100644
--- a/src/plugins/multimedia/darwin/qavfhelpers.mm
+++ b/src/plugins/multimedia/darwin/qavfhelpers.mm
@@ -7,6 +7,23 @@
 
 #import <CoreVideo/CoreVideo.h>
 
+static QVideoFrameFormat::ColorRange colorRangeForPixelFormat(unsigned avPixelFormat)
+{
+    switch (avPixelFormat) {
+    case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
+    case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+    case kCVPixelFormatType_420YpCbCr10BiPlanarFullRange:
+        return QVideoFrameFormat::ColorRange_Full;
+    case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+    case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange:
+    case kCVPixelFormatType_422YpCbCr8:
+    case kCVPixelFormatType_422YpCbCr8_yuvs:
+        return QVideoFrameFormat::ColorRange_Video;
+    default:
+        return QVideoFrameFormat::ColorRange_Unknown;
+    }
+}
+
 QVideoFrameFormat::PixelFormat QAVFHelpers::fromCVPixelFormat(unsigned avPixelFormat)
 {
     switch (avPixelFormat) {
@@ -149,6 +166,7 @@ QVideoFrameFormat QAVFHelpers::videoFormatForImageBuffer(CVImageBufferRef buffer
         }
     }
 
+    format.setColorRange(colorRangeForPixelFormat(avPixelFormat));
     format.setColorSpace(colorSpace);
     format.setColorTransfer(colorTransfer);
     return format;