From ce04499f465ff251d3a799e59a91f28d6e91418e Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Tue, 29 Sep 2020 10:24:05 +0200 Subject: [PATCH] videotoolbox: rework >= 10bit output handling - Force BGRA on macbooks not handling HEVC. This was done automatically before but it will likely change in the future like iOS. - Also force BGRA for 12 and 16bits since the openGL* implementation can't handle it. Manual backport of ce943a75 --- modules/codec/videotoolbox.m | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m index 1078a55a0e..9e19b65d0f 100644 --- a/modules/codec/videotoolbox.m +++ b/modules/codec/videotoolbox.m @@ -229,12 +229,19 @@ static void HXXXGetBestChroma(decoder_t *p_dec) #if !TARGET_OS_IPHONE if (deviceSupportsHEVC()) /* 42010bit went with HEVC on macOS */ p_sys->i_cvpx_format = kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange; -#else - /* Force BGRA output (and let VT handle the tone mapping) on iOS - * since the apple openGLES implementation can't handle 16 bit - * textures. */ - p_sys->i_cvpx_format = kCVPixelFormatType_32BGRA; + else #endif + /* Force BGRA output (and let VT handle the tone mapping) since the + * Apple openGL* implementation can't handle 16 bit textures. This + * is the case for iOS and some macOS devices (ones that are not + * handling HEVC). */ + p_sys->i_cvpx_format = kCVPixelFormatType_32BGRA; + } + else if (i_depth_luma > 10 && i_depth_chroma > 10) + { + /* XXX: The apple openGL implementation doesn't support 12 or 16 + * bit rendering */ + p_sys->i_cvpx_format = kCVPixelFormatType_32BGRA; } } }