From 950c8e924ef2b85e5ac1072b9939634997d46c49 Mon Sep 17 00:00:00 2001 From: Jake Bromberg Date: Thu, 20 Jan 2022 08:35:02 -0800 Subject: [PATCH] Allows Metal rendering in iOS simulator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13561 Change-Id: I25ae8160956eb9140b827fb391686a02817bfa02 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/247520 Reviewed-by: Anders Carlsson Reviewed-by: Kári Helgason Commit-Queue: Anders Carlsson Cr-Commit-Position: refs/heads/main@{#35825} --- sdk/objc/components/video_codec/RTCVideoDecoderH264.mm | 2 +- sdk/objc/components/video_codec/RTCVideoEncoderH264.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm index 06cfb741d8..7f47ace65a 100644 --- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm @@ -209,7 +209,7 @@ void decompressionOutputCallback(void *decoderRef, #endif CFTypeRef keys[attributesSize] = { -#if defined(WEBRTC_IOS) && TARGET_OS_MACCATALYST +#if defined(WEBRTC_IOS) && (TARGET_OS_MACCATALYST || TARGET_OS_SIMULATOR) kCVPixelBufferMetalCompatibilityKey, #elif defined(WEBRTC_IOS) kCVPixelBufferOpenGLESCompatibilityKey, diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm index 93ed03a7c3..912137d5a0 100644 --- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm @@ -607,7 +607,7 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id) // buffers retrieved from the encoder's pixel buffer pool. const size_t attributesSize = 3; CFTypeRef keys[attributesSize] = { -#if defined(WEBRTC_IOS) && TARGET_OS_MACCATALYST +#if defined(WEBRTC_IOS) && (TARGET_OS_MACCATALYST || TARGET_OS_SIMULATOR) kCVPixelBufferMetalCompatibilityKey, #elif defined(WEBRTC_IOS) kCVPixelBufferOpenGLESCompatibilityKey,