videotoolbox: full range video decoding is H264 only

62e03dd8 · Felix Paul Kühne · 06c5a102 · 62e03dd8
Commit 62e03dd8 authored Aug 24, 2015 by Felix Paul Kühne
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

modules/codec/videotoolbox.m modules/codec/videotoolbox.m +11 -3

No files found.
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -473,9 +473,17 @@ static int StartVideoToolbox(decoder_t *p_dec, block_t *p_block)
                         kCVPixelBufferOpenGLESCompatibilityKey,
                         kCFBooleanTrue);
 #endif
-    VTDictionarySetInt32(dpba,
-                         kCVPixelBufferPixelFormatTypeKey,
-                         kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
+
+    /* full range allows a broader range of colors but is H264 only */
+    if (p_sys->codec == kCMVideoCodecType_H264) {
+        VTDictionarySetInt32(dpba,
+                             kCVPixelBufferPixelFormatTypeKey,
+                             kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
+    } else {
+        VTDictionarySetInt32(dpba,
+                             kCVPixelBufferPixelFormatTypeKey,
+                             kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange);
+    }
    VTDictionarySetInt32(dpba,
                         kCVPixelBufferWidthKey,
                         i_video_width);