diff --git a/VoidLink/Metal/MetalVideoRenderer.m b/VoidLink/Metal/MetalVideoRenderer.m index 2bf482eb..750f04d4 100644 --- a/VoidLink/Metal/MetalVideoRenderer.m +++ b/VoidLink/Metal/MetalVideoRenderer.m @@ -404,11 +404,11 @@ CFStringRef __currentColorSpace; } else { newColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); } - newPixelFormat = MTLPixelFormatBGR10A2Unorm; + newPixelFormat = MTLPixelFormatBGRA10_XR; } else { // SDR 2020, I'm not sure it's possible to stream this though newColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); - newPixelFormat = MTLPixelFormatBGR10A2Unorm; + newPixelFormat = MTLPixelFormatBGRA10_XR; } if (isHDR) { paramBuffer.cscParams = (fullRange ? k_CscParams_Bt2020Full_10bit : k_CscParams_Bt2020Lim_10bit); @@ -439,11 +439,11 @@ CFStringRef __currentColorSpace; Log(LOG_I, @"Frame pixel format %@ - changing MetalLayer's pixel format to %@", layer.pixelFormat == MTLPixelFormatBGRA8Unorm ? @"MTLPixelFormatBGRA8Unorm" - : layer.pixelFormat == MTLPixelFormatBGR10A2Unorm ? @"MTLPixelFormatBGR10A2Unorm" + : layer.pixelFormat == MTLPixelFormatBGRA10_XR ? @"MTLPixelFormatBGRA10_XR" : [NSString stringWithFormat:@"Unknown: %lu", layer.pixelFormat], newPixelFormat == MTLPixelFormatBGRA8Unorm ? @"MTLPixelFormatBGRA8Unorm" - : newPixelFormat == MTLPixelFormatBGR10A2Unorm ? @"MTLPixelFormatBGR10A2Unorm" - : [NSString stringWithFormat:@"Unknown: %lu", (unsigned long)layer.pixelFormat]); + : newPixelFormat == MTLPixelFormatBGRA10_XR ? @"MTLPixelFormatBGRA10_XR" + : [NSString stringWithFormat:@"Unknown: %lu", (unsigned long)newPixelFormat]); } #if TARGET_OS_TV diff --git a/VoidLink/Metal/MetalViewController.m b/VoidLink/Metal/MetalViewController.m index 711524bc..30bc8d7f 100644 --- a/VoidLink/Metal/MetalViewController.m +++ b/VoidLink/Metal/MetalViewController.m @@ -63,14 +63,14 @@ // Use TARGET_OS_SIMULATOR to detect simulator environment MTLPixelFormat pixelFormat; #if TARGET_OS_SIMULATOR - // iOS Simulator doesn't support BGR10A2Unorm + // iOS Simulator doesn't support BGRA10_XR pixelFormat = MTLPixelFormatBGRA8Unorm; Log(LOG_W, @"Running on iOS Simulator, using BGRA8Unorm pixel format"); #else // On real devices, check if we should enable HDR if (_enableHdr) { - pixelFormat = MTLPixelFormatBGR10A2Unorm; - Log(LOG_I, @"HDR enabled, using BGR10A2Unorm pixel format"); + pixelFormat = MTLPixelFormatBGRA10_XR; + Log(LOG_I, @"HDR enabled, using BGRA10_XR pixel format"); } else { pixelFormat = MTLPixelFormatBGRA8Unorm; Log(LOG_I, @"HDR disabled, using BGRA8Unorm pixel format");