From e4d6be3bb3962d7c3f4364deae795ad7de9ef4b2 Mon Sep 17 00:00:00 2001 From: Acaki Date: Thu, 28 Aug 2025 21:29:51 +0800 Subject: [PATCH] Revert "fix: crash when host is on hdr but client is not on Metal lower iOS versions" This reverts commit 6c0b1550fd8d3654999f190d5b289152e710ddd4. --- VoidLink/Metal/MetalVideoRenderer.m | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/VoidLink/Metal/MetalVideoRenderer.m b/VoidLink/Metal/MetalVideoRenderer.m index 8fe8868a..2bf482eb 100644 --- a/VoidLink/Metal/MetalVideoRenderer.m +++ b/VoidLink/Metal/MetalVideoRenderer.m @@ -404,22 +404,11 @@ CFStringRef __currentColorSpace; } else { newColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); } - // Only use BGR10A2Unorm if HDR is enabled and the initial format supports it - if (_hdrEnabled && _colorPixelFormat == MTLPixelFormatBGR10A2Unorm) { - newPixelFormat = MTLPixelFormatBGR10A2Unorm; - } else { - newPixelFormat = MTLPixelFormatBGRA8Unorm; - } + newPixelFormat = MTLPixelFormatBGR10A2Unorm; } else { // SDR 2020, I'm not sure it's possible to stream this though newColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); - // For SDR content, respect the initially configured pixel format - // Don't force BGR10A2Unorm unless it was configured initially - if (_hdrEnabled && _colorPixelFormat == MTLPixelFormatBGR10A2Unorm) { - newPixelFormat = MTLPixelFormatBGR10A2Unorm; - } else { - newPixelFormat = MTLPixelFormatBGRA8Unorm; - } + newPixelFormat = MTLPixelFormatBGR10A2Unorm; } if (isHDR) { paramBuffer.cscParams = (fullRange ? k_CscParams_Bt2020Full_10bit : k_CscParams_Bt2020Lim_10bit);