<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277176] trunk/Source/ThirdParty/libwebrtc</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277176">277176</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-05-07 09:21:55 -0700 (Fri, 07 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow libwebrtc to build for Mac Catalyst
https://bugs.webkit.org/show_bug.cgi?id=225505

Reviewed by Youenn Fablet.

This is progress towards rdar://77568774

Changes necessary to get it to build and link were:
1. kCVPixelBufferOpenGLESCompatibilityKey is unavailable on Catalyst, so use kCVPixelBufferOpenGLCompatibilityKey like we do on macOS.
2. SSE4 and AVX seem to be unavailable in the Catalyst SDK like they are in the iOS simulator SDK, so disable them similarly.
3. Link to UIKit and CoreGraphics in debug builds like we do with iOS family builds.
4. Don't use @loader_path/../../../ for DYLIB_INSTALL_NAME_BASE like we do with relocatable Safari builds, similar to an ANGLE change I made in <a href="http://trac.webkit.org/projects/webkit/changeset/276318">r276318</a>
5. Export the same symbols as iOS for now.  This may need some tweaking when I get it to link with WebCore, but that's why this is only progress.

* Configurations/DebugRelease.xcconfig:
* Configurations/SDKVariant.xcconfig:
* Configurations/libvpx.xcconfig:
* Configurations/libwebrtc.xcconfig:
* Configurations/opus.xcconfig:
* Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h:
* Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h:
* Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h:
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm:
(-[RTCVideoDecoderH264 resetDecompressionSession]):
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm:
(-[RTCVideoDecoderH265 resetDecompressionSession]):
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm:
(-[RTCVideoDecoderVTBVP9 resetDecompressionSession]):
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
(-[RTCVideoEncoderH264 resetCompressionSessionWithPixelFormat:]):
* Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm:
(-[RTCVideoEncoderH265 resetCompressionSession]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationsDebugReleasexcconfig">trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationsSDKVariantxcconfig">trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationslibvpxxcconfig">trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationslibwebrtcxcconfig">trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationsopusxcconfig">trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vp8_rtcdh">trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vp9_rtcdh">trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vpx_dsp_rtcdh">trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderH264mm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderH265mm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderVTBVP9mm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoEncoderH264mm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoEncoderH265mm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog      2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2021-05-07  Alex Christensen  <achristensen@webkit.org>
+
+        Allow libwebrtc to build for Mac Catalyst
+        https://bugs.webkit.org/show_bug.cgi?id=225505
+
+        Reviewed by Youenn Fablet.
+
+        This is progress towards rdar://77568774
+
+        Changes necessary to get it to build and link were:
+        1. kCVPixelBufferOpenGLESCompatibilityKey is unavailable on Catalyst, so use kCVPixelBufferOpenGLCompatibilityKey like we do on macOS.
+        2. SSE4 and AVX seem to be unavailable in the Catalyst SDK like they are in the iOS simulator SDK, so disable them similarly.
+        3. Link to UIKit and CoreGraphics in debug builds like we do with iOS family builds.
+        4. Don't use @loader_path/../../../ for DYLIB_INSTALL_NAME_BASE like we do with relocatable Safari builds, similar to an ANGLE change I made in r276318
+        5. Export the same symbols as iOS for now.  This may need some tweaking when I get it to link with WebCore, but that's why this is only progress.
+
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/SDKVariant.xcconfig:
+        * Configurations/libvpx.xcconfig:
+        * Configurations/libwebrtc.xcconfig:
+        * Configurations/opus.xcconfig:
+        * Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h:
+        * Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h:
+        * Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h:
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm:
+        (-[RTCVideoDecoderH264 resetDecompressionSession]):
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm:
+        (-[RTCVideoDecoderH265 resetDecompressionSession]):
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm:
+        (-[RTCVideoDecoderVTBVP9 resetDecompressionSession]):
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
+        (-[RTCVideoEncoderH264 resetCompressionSessionWithPixelFormat:]):
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm:
+        (-[RTCVideoEncoderH265 resetCompressionSession]):
+
</ins><span class="cx"> 2021-05-05  Yury Semikhatsky  <yurys@chromium.org>
</span><span class="cx"> 
</span><span class="cx">         [LibWebRTC][WPE][GTK] do not use system installed vpx headers when building webrtc
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -67,3 +67,5 @@
</span><span class="cx"> OTHER_LDFLAGS[config=Debug][sdk=iphone*] = $(inherited) -framework UIKit -framework CoreGraphics
</span><span class="cx"> OTHER_LDFLAGS[config=Debug][sdk=tv*] = $(inherited) -framework UIKit -framework CoreGraphics
</span><span class="cx"> OTHER_LDFLAGS[config=Debug][sdk=watch*] = $(inherited) -framework UIKit -framework CoreGraphics
</span><ins>+OTHER_LDFLAGS[config=Debug][sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_$(WK_IS_CATALYST))
+OTHER_LDFLAGS_YES = -framework UIKit -framework CoreGraphics
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationsSDKVariantxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig     2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig        2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -37,6 +37,10 @@
</span><span class="cx"> WK_ALTERNATE_PLATFORM_NAME_iosmac = maccatalyst;
</span><span class="cx"> WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
</span><span class="cx"> 
</span><ins>+WK_CHECK_CATALYST = $(WK_CHECK_CATALYST_$(SDK_VARIANT));
+WK_CHECK_CATALYST_iosmac = YES;
+WK_IS_CATALYST = $(WK_NOT_$(WK_EMPTY_$(WK_CHECK_CATALYST)));
+
</ins><span class="cx"> WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
</span><span class="cx"> WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationslibvpxxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig 2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig    2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -14,11 +14,14 @@
</span><span class="cx"> PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
</span><span class="cx"> USE_HEADERMAP = NO;
</span><span class="cx"> 
</span><del>-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WK_DISABLE_HARDWARE_ACCELERATION;
</del><ins>+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION;
+GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) $(GCC_PREPROCESSOR_DEFINITIONS_$(WK_IS_CATALYST))
+GCC_PREPROCESSOR_DEFINITIONS_YES = WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx"> 
</span><span class="cx"> ARM_FILES = *_neon.c arm_cpudetect.c *_arm.c
</span><span class="cx"> X86_FILES = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *.asm
</span><span class="cx"> 
</span><del>-EXCLUDED_SOURCE_FILE_NAMES[arch=x86_64] = $(ARM_FILES)
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[arch=x86_64] = $(ARM_FILES) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_IS_CATALYST));
+EXCLUDED_SOURCE_FILE_NAMES_YES = *_sse4.c *_avx.c;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = $(X86_FILES) *_mmx.c
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=x86_64] = $(ARM_FILES) $(X86_FILES)
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationslibwebrtcxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig      2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -25,7 +25,9 @@
</span><span class="cx"> 
</span><span class="cx"> PRODUCT_NAME = libwebrtc;
</span><span class="cx"> 
</span><del>-EXPORTED_SYMBOLS_FILE[sdk=macosx*] = Configurations/libwebrtc.mac.exp;
</del><ins>+EXPORTED_SYMBOLS_FILE[sdk=macosx*] = $(EXPORTED_SYMBOLS_FILE_$(WK_IS_CATALYST))
+EXPORTED_SYMBOLS_FILE_NO = Configurations/libwebrtc.mac.exp;
+EXPORTED_SYMBOLS_FILE_YES = Configurations/libwebrtc.iOS.exp;
</ins><span class="cx"> EXPORTED_SYMBOLS_FILE[sdk=iphoneos*] = Configurations/libwebrtc.iOS.exp;
</span><span class="cx"> EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
</span><span class="cx"> 
</span><span class="lines">@@ -36,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
</span><del>-DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = @loader_path/../../../;
</del><ins>+DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
</span><span class="cx"> 
</span><span class="lines">@@ -51,7 +53,8 @@
</span><span class="cx"> // FIXME: Set WEBRTC_USE_BUILTIN_ISAC_FIX and WEBRTC_USE_BUILTIN_ISAC_FLOAT for iOS and Mac
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = GTEST_RELATIVE_PATH WEBRTC_OPUS_SUPPORT_120MS_PTIME=0 WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_NETINET_IN_H HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_USE_BUILTIN_OPUS WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE  HAVE_SCTP WEBRTC_CODEC_G711 WEBRTC_CODEC_G722 WEBRTC_OPUS_VARIABLE_COMPLEXITY=0 WEBRTC_USE_BUILTIN_ISAC_FIX=1 WEBRTC_USE_BUILTIN_ISAC_FLOAT=0 USE_BUILTIN_SW_CODECS WEBRTC_WEBKIT_BUILD RTC_ENABLE_VP9 NO_MAIN_THREAD_WRAPPING RTC_DISABLE_TRACE_EVENTS $(inherited);
</span><span class="cx"> 
</span><del>-GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) WEBRTC_USE_VTB_HARDWARE_ENCODER;
</del><ins>+GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) WEBRTC_USE_VTB_HARDWARE_ENCODER $(GCC_PREPROCESSOR_DEFINITIONS_$(WK_IS_CATALYST));
+GCC_PREPROCESSOR_DEFINITIONS_YES = WEBRTC_MAC_CATALYST WEBRTC_IOS;
</ins><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WEBRTC_IOS;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_IOS;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationsopusxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -18,7 +18,10 @@
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64] = $(inherited) OPUS_X86_MAY_HAVE_SSE2 OPUS_X86_PRESUME_SSE2 $(SSE4_FLAG);
</span><span class="cx"> 
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *_sse.c *_sse4_1.c x86_silk_map.c;
</span><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_IS_CATALYST));
+EXCLUDED_SOURCE_FILE_NAMES_YES = *_sse4_1.c x86_silk_map.c;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = *_sse.c *_sse2.c *_sse4_1.c x86_silk_map.c;
</span><span class="cx"> 
</span><del>-// The iOS Simulator can't use SSE4 intrinsics, but macOS can.
-SSE4_FLAG[sdk=macosx*] = OPUS_X86_MAY_HAVE_SSE4_1;
</del><ins>+// The iOS Simulator and Catalyst can't use SSE4 intrinsics, but macOS can.
+SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG_$(WK_IS_CATALYST))
+SSE4_FLAG_NO = OPUS_X86_MAY_HAVE_SSE4_1;
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vp8_rtcdh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h     2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp8_rtcd.h        2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#if WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #include "vp8_rtcd_no_acceleration.h"
</span><span class="cx"> #else
</span><span class="cx"> 
</span><span class="lines">@@ -655,11 +655,15 @@
</span><span class="cx">   vp8_full_search_sad = vp8_full_search_sad_c;
</span><span class="cx">   if (flags & HAS_SSE3)
</span><span class="cx">     vp8_full_search_sad = vp8_full_search_sadx3;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp8_full_search_sad = vp8_full_search_sadx8;
</span><ins>+#endif
</ins><span class="cx">   vp8_regular_quantize_b = vp8_regular_quantize_b_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
</span><span class="cx">   if (flags & HAS_SSSE3)
</span><span class="cx">     vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3;
</span><span class="lines">@@ -681,4 +685,4 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#endif // WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#endif // WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vp9_rtcdh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h     2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vp9_rtcd.h        2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">                              int increase_denoising,
</span><span class="cx">                              BLOCK_SIZE bs,
</span><span class="cx">                              int motion_magnitude);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_denoiser_filter vp9_denoiser_filter_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_denoiser_filter vp9_denoiser_filter_sse2
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">                        tran_low_t* output,
</span><span class="cx">                        int stride,
</span><span class="cx">                        int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_fht16x16 vp9_fht16x16_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_fht16x16 vp9_fht16x16_sse2
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">                      tran_low_t* output,
</span><span class="cx">                      int stride,
</span><span class="cx">                      int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_fht4x4 vp9_fht4x4_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_fht4x4 vp9_fht4x4_sse2
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">                      tran_low_t* output,
</span><span class="cx">                      int stride,
</span><span class="cx">                      int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_fht8x8 vp9_fht8x8_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_fht8x8 vp9_fht8x8_sse2
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">                                     uint8_t* dst,
</span><span class="cx">                                     int dst_stride,
</span><span class="cx">                                     int src_weight);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">                                   uint8_t* dst,
</span><span class="cx">                                   int dst_stride,
</span><span class="cx">                                   int src_weight);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> 
</span><span class="cx"> void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
</span><span class="cx"> void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_fwht4x4 vp9_fwht4x4_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_fwht4x4 vp9_fwht4x4_sse2
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx">                                     intptr_t block_size,
</span><span class="cx">                                     int64_t* ssz,
</span><span class="cx">                                     int bd);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_highbd_block_error vp9_highbd_block_error_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_highbd_block_error vp9_highbd_block_error_sse2
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">                                uint8_t* dest,
</span><span class="cx">                                int stride,
</span><span class="cx">                                int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">                             uint8_t* dest,
</span><span class="cx">                             int stride,
</span><span class="cx">                             int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">                             uint8_t* dest,
</span><span class="cx">                             int stride,
</span><span class="cx">                             int tx_type);
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
</span><span class="cx"> #else
</span><span class="cx"> #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> 
</span><span class="cx">   (void)flags;
</span><span class="cx"> 
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx">   vp9_block_error = vp9_block_error_c;
</span><span class="cx">   vp9_block_error_fp = vp9_block_error_fp_c;
</span><span class="cx"> #else
</span><span class="lines">@@ -515,26 +515,26 @@
</span><span class="cx">   vp9_block_error_fp = vp9_block_error_fp_sse2;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_diamond_search_sad = vp9_diamond_search_sad_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_AVX)
</span><span class="cx">     vp9_diamond_search_sad = vp9_diamond_search_sad_avx;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_highbd_iht4x4_16_add = vp9_highbd_iht4x4_16_add_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp9_highbd_iht4x4_16_add = vp9_highbd_iht4x4_16_add_sse4_1;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1;
</span><span class="cx"> #endif
</span><del>-#ifdef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifdef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx">   vp9_quantize_fp = vp9_quantize_fp_c;
</span><span class="cx"> #else
</span><span class="cx">   vp9_quantize_fp = vp9_quantize_fp_sse2;
</span><span class="lines">@@ -542,22 +542,22 @@
</span><span class="cx">     vp9_quantize_fp = vp9_quantize_fp_ssse3;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifndef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx">   if (flags & HAS_SSSE3)
</span><span class="cx">     vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#ifndef WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx">   if (flags & HAS_SSSE3)
</span><span class="cx">     vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_ssse3;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_apply_temporal_filter = vp9_apply_temporal_filter_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp9_apply_temporal_filter = vp9_apply_temporal_filter_sse4_1;
</span><span class="cx"> #endif
</span><span class="cx">   vp9_highbd_apply_temporal_filter = vp9_highbd_apply_temporal_filter_c;
</span><del>-#ifndef WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if !defined(WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION) && !defined(WEBRTC_WEBKIT_MAC_CATALIST)
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vp9_highbd_apply_temporal_filter = vp9_highbd_apply_temporal_filter_sse4_1;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcethird_partylibvpxsourceconfigmacx64vpx_dsp_rtcdh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h 2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h    2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#if WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#if WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins><span class="cx"> #include "vpx_dsp_rtcd_no_acceleration.h"
</span><span class="cx"> #else
</span><span class="cx"> 
</span><span class="lines">@@ -7812,32 +7812,50 @@
</span><span class="cx">   vpx_highbd_hadamard_32x32 = vpx_highbd_hadamard_32x32_c;
</span><span class="cx">   vpx_highbd_hadamard_8x8 = vpx_highbd_hadamard_8x8_c;
</span><span class="cx">   vpx_highbd_idct16x16_10_add = vpx_highbd_idct16x16_10_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct16x16_10_add = vpx_highbd_idct16x16_10_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct16x16_256_add = vpx_highbd_idct16x16_256_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct16x16_256_add = vpx_highbd_idct16x16_256_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct16x16_38_add = vpx_highbd_idct16x16_38_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct16x16_38_add = vpx_highbd_idct16x16_38_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct32x32_1024_add = vpx_highbd_idct32x32_1024_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct32x32_1024_add = vpx_highbd_idct32x32_1024_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct32x32_135_add = vpx_highbd_idct32x32_135_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct32x32_135_add = vpx_highbd_idct32x32_135_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct32x32_34_add = vpx_highbd_idct32x32_34_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct32x32_34_add = vpx_highbd_idct32x32_34_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct4x4_16_add = vpx_highbd_idct4x4_16_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct4x4_16_add = vpx_highbd_idct4x4_16_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct8x8_12_add = vpx_highbd_idct8x8_12_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct8x8_12_add = vpx_highbd_idct8x8_12_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_idct8x8_64_add = vpx_highbd_idct8x8_64_add_sse2;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_highbd_idct8x8_64_add = vpx_highbd_idct8x8_64_add_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_highbd_satd = vpx_highbd_satd_c;
</span><span class="cx">   vpx_idct32x32_135_add = vpx_idct32x32_135_add_sse2;
</span><span class="cx">   if (flags & HAS_SSSE3)
</span><span class="lines">@@ -7864,8 +7882,10 @@
</span><span class="cx">   if (flags & HAS_SSSE3)
</span><span class="cx">     vpx_sad16x16x3 = vpx_sad16x16x3_ssse3;
</span><span class="cx">   vpx_sad16x16x8 = vpx_sad16x16x8_c;
</span><ins>+#ifndef WEBRTC_WEBKIT_MAC_CATALIST
</ins><span class="cx">   if (flags & HAS_SSE4_1)
</span><span class="cx">     vpx_sad16x16x8 = vpx_sad16x16x8_sse4_1;
</span><ins>+#endif
</ins><span class="cx">   vpx_sad16x8x3 = vpx_sad16x8x3_c;
</span><span class="cx">   if (flags & HAS_SSE3)
</span><span class="cx">     vpx_sad16x8x3 = vpx_sad16x8x3_sse3;
</span><span class="lines">@@ -8004,4 +8024,4 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#endif // WK_DISABLE_HARDWARE_ACCELERATION
</del><ins>+#endif // WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderH264mm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -208,10 +208,10 @@
</span><span class="cx">   // we can pass CVPixelBuffers as native handles in decoder output.
</span><span class="cx">   static size_t const attributesSize = 3;
</span><span class="cx">   CFTypeRef keys[attributesSize] = {
</span><del>-#if defined(WEBRTC_IOS)
</del><ins>+#if defined(WEBRTC_MAC) || defined(WEBRTC_MAC_CATALYST)
+    kCVPixelBufferOpenGLCompatibilityKey,
+#elif defined(WEBRTC_IOS)
</ins><span class="cx">     kCVPixelBufferOpenGLESCompatibilityKey,
</span><del>-#elif defined(WEBRTC_MAC)
-    kCVPixelBufferOpenGLCompatibilityKey,
</del><span class="cx"> #endif
</span><span class="cx">     kCVPixelBufferIOSurfacePropertiesKey,
</span><span class="cx">     kCVPixelBufferPixelFormatTypeKey
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderH265mm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderH265.mm      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -205,10 +205,10 @@
</span><span class="cx">   // we can pass CVPixelBuffers as native handles in decoder output.
</span><span class="cx">   static size_t const attributesSize = 3;
</span><span class="cx">   CFTypeRef keys[attributesSize] = {
</span><del>-#if defined(WEBRTC_IOS)
</del><ins>+#if defined(WEBRTC_MAC) || defined(WEBRTC_MAC_CATALYST)
+    kCVPixelBufferOpenGLCompatibilityKey,
+#elif defined(WEBRTC_IOS)
</ins><span class="cx">     kCVPixelBufferOpenGLESCompatibilityKey,
</span><del>-#elif defined(WEBRTC_MAC)
-    kCVPixelBufferOpenGLCompatibilityKey,
</del><span class="cx"> #endif
</span><span class="cx">     kCVPixelBufferIOSurfacePropertiesKey,
</span><span class="cx">     kCVPixelBufferPixelFormatTypeKey
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoDecoderVTBVP9mm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm 2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm    2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -305,10 +305,10 @@
</span><span class="cx">   // we can pass CVPixelBuffers as native handles in decoder output.
</span><span class="cx">   static size_t const attributesSize = 3;
</span><span class="cx">   CFTypeRef keys[attributesSize] = {
</span><del>-#if defined(WEBRTC_IOS)
</del><ins>+#if defined(WEBRTC_MAC) || defined(WEBRTC_MAC_CATALYST)
+    kCVPixelBufferOpenGLCompatibilityKey,
+#elif defined(WEBRTC_IOS)
</ins><span class="cx">     kCVPixelBufferOpenGLESCompatibilityKey,
</span><del>-#elif defined(WEBRTC_MAC)
-    kCVPixelBufferOpenGLCompatibilityKey,
</del><span class="cx"> #endif
</span><span class="cx">     kCVPixelBufferIOSurfacePropertiesKey,
</span><span class="cx">     kCVPixelBufferPixelFormatTypeKey
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoEncoderH264mm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -658,10 +658,10 @@
</span><span class="cx">   // buffers retrieved from the encoder's pixel buffer pool.
</span><span class="cx">   const size_t attributesSize = 3;
</span><span class="cx">   CFTypeRef keys[attributesSize] = {
</span><del>-#if defined(WEBRTC_IOS)
</del><ins>+#if defined(WEBRTC_MAC) || defined(WEBRTC_MAC_CATALYST)
+    kCVPixelBufferOpenGLCompatibilityKey,
+#elif defined(WEBRTC_IOS)
</ins><span class="cx">     kCVPixelBufferOpenGLESCompatibilityKey,
</span><del>-#elif defined(WEBRTC_MAC)
-    kCVPixelBufferOpenGLCompatibilityKey,
</del><span class="cx"> #endif
</span><span class="cx">     kCVPixelBufferIOSurfacePropertiesKey,
</span><span class="cx">     kCVPixelBufferPixelFormatTypeKey
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjccomponentsvideo_codecRTCVideoEncoderH265mm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm (277175 => 277176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm   2021-05-07 15:51:36 UTC (rev 277175)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm      2021-05-07 16:21:55 UTC (rev 277176)
</span><span class="lines">@@ -364,10 +364,10 @@
</span><span class="cx">   // buffers retrieved from the encoder's pixel buffer pool.
</span><span class="cx">   const size_t attributesSize = 3;
</span><span class="cx">   CFTypeRef keys[attributesSize] = {
</span><del>-#if defined(WEBRTC_IOS)
</del><ins>+#if defined(WEBRTC_MAC) || defined(WEBRTC_MAC_CATALYST)
+    kCVPixelBufferOpenGLCompatibilityKey,
+#elif defined(WEBRTC_IOS)
</ins><span class="cx">     kCVPixelBufferOpenGLESCompatibilityKey,
</span><del>-#elif defined(WEBRTC_MAC)
-    kCVPixelBufferOpenGLCompatibilityKey,
</del><span class="cx"> #endif
</span><span class="cx">     kCVPixelBufferIOSurfacePropertiesKey,
</span><span class="cx">     kCVPixelBufferPixelFormatTypeKey
</span></span></pre>
</div>
</div>

</body>
</html>