Import LibWebRTC from upstream (275313@main)

Author: philn

.git-blame-ignore-revs

@@ -0,0 +1 @@
+4843f46ea7b6b6e17470e670d9c9f748c3455720

Source/ThirdParty/libwebrtc/CMakeLists.txt

@@ -42,7 +42,6 @@ set(webrtc_SOURCES
     Source/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
     Source/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
     Source/third_party/abseil-cpp/absl/base/log_severity.cc
-    Source/third_party/abseil-cpp/absl/base/spinlock_test_common.cc
     Source/third_party/abseil-cpp/absl/container/internal/hash_generator_testing.cc
     Source/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
     Source/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
@@ -110,7 +109,6 @@ set(webrtc_SOURCES
     Source/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc
     Source/third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
     Source/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
-    Source/third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
     Source/third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
     Source/third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc
     Source/third_party/abseil-cpp/absl/strings/internal/cordz_info.cc
@@ -191,7 +189,6 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/crypto/bio/bio.c
     Source/third_party/boringssl/src/crypto/bio/bio_mem.c
     Source/third_party/boringssl/src/crypto/bio/connect.c
-    Source/third_party/boringssl/src/crypto/bio/errno.c
     Source/third_party/boringssl/src/crypto/bio/fd.c
     Source/third_party/boringssl/src/crypto/bio/file.c
     Source/third_party/boringssl/src/crypto/bio/hexdump.c
@@ -340,7 +337,7 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/crypto/fipsmodule/tls/kdf.c
     Source/third_party/boringssl/src/crypto/hpke/hpke.c
     Source/third_party/boringssl/src/crypto/hrss/hrss.c
-    Source/third_party/boringssl/src/crypto/keccak/keccak.c
+    Source/third_party/boringssl/src/crypto/kyber/keccak.c
     Source/third_party/boringssl/src/crypto/kyber/kyber.c
     Source/third_party/boringssl/src/crypto/lhash/lhash.c
     Source/third_party/boringssl/src/crypto/mem.c
@@ -369,7 +366,8 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/crypto/rand_extra/rand_extra.c
     Source/third_party/boringssl/src/crypto/rand_extra/windows.c
     Source/third_party/boringssl/src/crypto/rc4/rc4.c
-    Source/third_party/boringssl/src/crypto/refcount.c
+    Source/third_party/boringssl/src/crypto/refcount_c11.c
+    Source/third_party/boringssl/src/crypto/refcount_lock.c
     Source/third_party/boringssl/src/crypto/rsa_extra/rsa_asn1.c
     Source/third_party/boringssl/src/crypto/rsa_extra/rsa_crypt.c
     Source/third_party/boringssl/src/crypto/rsa_extra/rsa_print.c
@@ -471,45 +469,6 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
     Source/third_party/boringssl/src/decrepit/x509/x509_decrepit.c
     Source/third_party/boringssl/src/decrepit/xts/xts.c
-    Source/third_party/boringssl/src/pki/asn1_util.cc
-    Source/third_party/boringssl/src/pki/cert_error_id.cc
-    Source/third_party/boringssl/src/pki/cert_error_params.cc
-    Source/third_party/boringssl/src/pki/cert_errors.cc
-    Source/third_party/boringssl/src/pki/cert_issuer_source_static.cc
-    Source/third_party/boringssl/src/pki/certificate_policies.cc
-    Source/third_party/boringssl/src/pki/common_cert_errors.cc
-    Source/third_party/boringssl/src/pki/crl.cc
-    Source/third_party/boringssl/src/pki/encode_values.cc
-    Source/third_party/boringssl/src/pki/extended_key_usage.cc
-    Source/third_party/boringssl/src/pki/fillins/file_util.cc
-    Source/third_party/boringssl/src/pki/fillins/fillins_base64.cc
-    Source/third_party/boringssl/src/pki/fillins/fillins_string_util.cc
-    Source/third_party/boringssl/src/pki/fillins/openssl_util.cc
-    Source/third_party/boringssl/src/pki/fillins/path_service.cc
-    Source/third_party/boringssl/src/pki/general_names.cc
-    Source/third_party/boringssl/src/pki/input.cc
-    Source/third_party/boringssl/src/pki/ip_util.cc
-    Source/third_party/boringssl/src/pki/mock_signature_verify_cache.cc
-    Source/third_party/boringssl/src/pki/name_constraints.cc
-    Source/third_party/boringssl/src/pki/ocsp.cc
-    Source/third_party/boringssl/src/pki/ocsp_verify_result.cc
-    Source/third_party/boringssl/src/pki/parse_certificate.cc
-    Source/third_party/boringssl/src/pki/parse_name.cc
-    Source/third_party/boringssl/src/pki/parse_values.cc
-    Source/third_party/boringssl/src/pki/parsed_certificate.cc
-    Source/third_party/boringssl/src/pki/parser.cc
-    Source/third_party/boringssl/src/pki/pem.cc
-    Source/third_party/boringssl/src/pki/revocation_util.cc
-    Source/third_party/boringssl/src/pki/signature_algorithm.cc
-    Source/third_party/boringssl/src/pki/simple_path_builder_delegate.cc
-    Source/third_party/boringssl/src/pki/string_util.cc
-    Source/third_party/boringssl/src/pki/tag.cc
-    Source/third_party/boringssl/src/pki/trust_store.cc
-    Source/third_party/boringssl/src/pki/trust_store_collection.cc
-    Source/third_party/boringssl/src/pki/trust_store_in_memory.cc
-    Source/third_party/boringssl/src/pki/verify_certificate_chain.cc
-    Source/third_party/boringssl/src/pki/verify_name_match.cc
-    Source/third_party/boringssl/src/pki/verify_signed_data.cc
     Source/third_party/boringssl/src/rust/bssl-sys/rust_wrapper.c
     Source/third_party/boringssl/src/ssl/bio_ssl.cc
     Source/third_party/boringssl/src/ssl/d1_both.cc
@@ -567,10 +526,13 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/tool/transport_common.cc
     Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
     Source/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc
+    Source/third_party/crc32c/src/src/crc32c_arm64.cc
+    Source/third_party/crc32c/src/src/crc32c.cc
+    Source/third_party/crc32c/src/src/crc32c_portable.cc
+    Source/third_party/crc32c/src/src/crc32c_sse42.cc
     Source/third_party/libyuv/source/compare.cc
     Source/third_party/libyuv/source/compare_common.cc
     Source/third_party/libyuv/source/compare_gcc.cc
-    Source/third_party/libyuv/source/compare_mmi.cc
     Source/third_party/libyuv/source/compare_msa.cc
     Source/third_party/libyuv/source/convert_argb.cc
     Source/third_party/libyuv/source/convert.cc
@@ -589,15 +551,13 @@ set(webrtc_SOURCES
     Source/third_party/libyuv/source/rotate_common.cc
     Source/third_party/libyuv/source/rotate_gcc.cc
     Source/third_party/libyuv/source/rotate_lsx.cc
-    Source/third_party/libyuv/source/rotate_mmi.cc
     Source/third_party/libyuv/source/rotate_msa.cc
     Source/third_party/libyuv/source/rotate_win.cc
     Source/third_party/libyuv/source/row_any.cc
     Source/third_party/libyuv/source/row_common.cc
     Source/third_party/libyuv/source/row_gcc.cc
     Source/third_party/libyuv/source/row_lasx.cc
     Source/third_party/libyuv/source/row_lsx.cc
-    Source/third_party/libyuv/source/row_mmi.cc
     Source/third_party/libyuv/source/row_msa.cc
     Source/third_party/libyuv/source/row_win.cc
     Source/third_party/libyuv/source/scale_any.cc
@@ -606,9 +566,9 @@ set(webrtc_SOURCES
     Source/third_party/libyuv/source/scale_common.cc
     Source/third_party/libyuv/source/scale_gcc.cc
     Source/third_party/libyuv/source/scale_lsx.cc
-    Source/third_party/libyuv/source/scale_mmi.cc
     Source/third_party/libyuv/source/scale_msa.cc
     Source/third_party/libyuv/source/scale_rgb.cc
+    Source/third_party/libyuv/source/scale_rvv.cc
     Source/third_party/libyuv/source/scale_uv.cc
     Source/third_party/libyuv/source/scale_win.cc
     Source/third_party/libyuv/source/video_common.cc
@@ -910,7 +870,6 @@ set(webrtc_SOURCES
     Source/webrtc/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc
     Source/webrtc/logging/rtc_event_log/ice_logger.cc
     Source/webrtc/logging/rtc_event_log/rtc_event_log_impl.cc
-    Source/webrtc/logging/rtc_event_log/rtc_event_processor.cc
     Source/webrtc/logging/rtc_event_log/rtc_stream_config.cc
     Source/webrtc/media/base/adapted_video_track_source.cc
     Source/webrtc/media/base/codec.cc
@@ -1261,8 +1220,6 @@ set(webrtc_SOURCES
     Source/webrtc/modules/audio_processing/residual_echo_detector.cc
     Source/webrtc/modules/audio_processing/rms_level.cc
     Source/webrtc/modules/audio_processing/splitting_filter.cc
-    Source/webrtc/modules/audio_processing/test/conversational_speech/config.cc
-    Source/webrtc/modules/audio_processing/test/conversational_speech/timing.cc
     Source/webrtc/modules/audio_processing/three_band_filter_bank.cc
     Source/webrtc/modules/audio_processing/transient/click_annotate.cc
     Source/webrtc/modules/audio_processing/transient/file_utils.cc
@@ -1434,10 +1391,6 @@ set(webrtc_SOURCES
     Source/webrtc/modules/third_party/g722/g722_encode.c
     Source/webrtc/modules/third_party/portaudio/pa_ringbuffer.c
     Source/webrtc/modules/video_capture/device_info_impl.cc
-    Source/webrtc/modules/video_capture/linux/device_info_linux.cc
-    Source/webrtc/modules/video_capture/linux/device_info_v4l2.cc
-    Source/webrtc/modules/video_capture/linux/video_capture_linux.cc
-    Source/webrtc/modules/video_capture/linux/video_capture_v4l2.cc
     Source/webrtc/modules/video_capture/video_capture_factory.cc
     Source/webrtc/modules/video_capture/video_capture_factory_null.cc
     Source/webrtc/modules/video_capture/video_capture_impl.cc
@@ -1569,6 +1522,7 @@ set(webrtc_SOURCES
     Source/webrtc/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
     Source/webrtc/net/dcsctp/packet/parameter/state_cookie_parameter.cc
     Source/webrtc/net/dcsctp/packet/parameter/supported_extensions_parameter.cc
+    Source/webrtc/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
     Source/webrtc/net/dcsctp/packet/sctp_packet.cc
     Source/webrtc/net/dcsctp/packet/tlv_trait.cc
     Source/webrtc/net/dcsctp/public/dcsctp_handover_state.cc
@@ -1670,10 +1624,10 @@ set(webrtc_SOURCES
     Source/webrtc/pc/sctp_transport.cc
     Source/webrtc/pc/sctp_utils.cc
     Source/webrtc/pc/sdp_offer_answer.cc
-    Source/webrtc/pc/sdp_serializer.cc
     Source/webrtc/pc/sdp_utils.cc
     Source/webrtc/pc/session_description.cc
     Source/webrtc/pc/simulcast_description.cc
+    Source/webrtc/pc/simulcast_sdp_serializer.cc
     Source/webrtc/pc/srtp_filter.cc
     Source/webrtc/pc/srtp_session.cc
     Source/webrtc/pc/srtp_transport.cc
@@ -1825,7 +1779,6 @@ set(webrtc_SOURCES
     Source/webrtc/stats/rtc_stats_report.cc
     Source/webrtc/system_wrappers/source/clock.cc
     Source/webrtc/system_wrappers/source/cpu_features.cc
-    Source/webrtc/system_wrappers/source/cpu_features_linux.cc
     Source/webrtc/system_wrappers/source/cpu_info.cc
     Source/webrtc/system_wrappers/source/denormal_disabler.cc
     Source/webrtc/system_wrappers/source/field_trial.cc
@@ -1855,9 +1808,9 @@ set(webrtc_SOURCES
     Source/webrtc/video/frame_cadence_adapter.cc
     Source/webrtc/video/frame_decode_timing.cc
     Source/webrtc/video/frame_dumping_decoder.cc
+    Source/webrtc/video/frame_dumping_encoder.cc
     Source/webrtc/video/frame_encode_metadata_writer.cc
     Source/webrtc/video/quality_limitation_reason_tracker.cc
-    Source/webrtc/video/quality_threshold.cc
     Source/webrtc/video/receive_statistics_proxy.cc
     Source/webrtc/video/render/incoming_video_stream.cc
     Source/webrtc/video/render/video_render_frames.cc
@@ -2147,7 +2100,14 @@ else ()
         set(WEBKIT_LIBWEBRTC_OPENH264_ENCODER 0)
     else()
         list(APPEND webrtc_SOURCES
+            Source/webrtc/modules/video_capture/linux/device_info_linux.cc
+            Source/webrtc/modules/video_capture/linux/device_info_v4l2.cc
+            Source/webrtc/modules/video_capture/linux/video_capture_linux.cc
+            Source/webrtc/modules/video_capture/linux/video_capture_v4l2.cc
+
             Source/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+
+            Source/webrtc/system_wrappers/source/cpu_features_linux.cc
         )
         set(WEBKIT_LIBWEBRTC_OPENH264_ENCODER 1)
     endif ()
@@ -2173,23 +2133,14 @@ else ()
 
         Source/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
         Source/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+        Source/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
         Source/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
+        Source/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
         Source/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
+        Source/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
 
         Source/webrtc/modules/video_coding/codecs/h264/h264.cc
     )
-
-    find_package(LibPulse)
-    if (NOT LIBPULSE_FOUND)
-        message(STATUS "libpulse is not found, not building support.")
-    else()
-        list(APPEND webrtc_SOURCES
-            Source/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
-            Source/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
-            Source/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
-        )
-    endif ()
-
 endif ()
 
 add_library(webrtc STATIC ${webrtc_SOURCES})
@@ -2285,6 +2236,8 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
     Source/third_party/abseil-cpp
     Source/third_party/abseil-cpp/absl/types
     Source/third_party/boringssl/src/include
+    Source/third_party/crc32c/config
+    Source/third_party/crc32c/src/include
     Source/third_party/libsrtp/config
     Source/third_party/libsrtp/crypto/include
     Source/third_party/libsrtp/include
@@ -2770,7 +2723,6 @@ if (APPLE)
         Source/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
         Source/third_party/libvpx/source/libvpx/vp8/vp8_ratectrl_rtc.cc
         Source/third_party/libvpx/source/libvpx/vp9/encoder/vp9_tpl_model.c
-        Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c
         Source/third_party/libvpx/source/libvpx/vpx/src/vpx_tpl.c
     )
 
@@ -2791,6 +2743,7 @@ if (APPLE)
             Source/third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_mmx.c
             Source/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c
             Source/third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c
+            Source/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c
             Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct8x8_add_sse4.c
             Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct4x4_add_sse4.c
             Source/third_party/libvpx/source/libvpx/vpx_dsp/x86/highbd_idct32x32_add_sse4.c
@@ -3031,8 +2984,9 @@ if (APPLE)
         )
         target_compile_options(vpx PRIVATE -mavx2)
     else ()
+        # Use the linux configuration instead of iOS on Cocoa arm64 platforms.
         list(APPEND vpx_INCLUDE_DIRECTORIES
-            Source/third_party/libvpx/source/config/ios/arm64
+            Source/third_party/libvpx/source/config/linux/arm64-highbd
         )
     endif ()
     target_include_directories(vpx PRIVATE ${vpx_INCLUDE_DIRECTORIES})

Source/ThirdParty/libwebrtc/Configurations/Base-libvpx.xcconfig

@@ -0,0 +1,16 @@
+CLANG_WARN_BOOL_CONVERSION = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
+CLANG_WARN_STRICT_PROTOTYPES = NO;
+CLANG_X86_VECTOR_INSTRUCTIONS = default;
+GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+COMBINE_HIDPI_IMAGES = NO;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
+
+HEADER_SEARCH_PATHS[arch=x86_64] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
+HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libvpx/source/config/linux/arm64-highbd Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
+USE_HEADERMAP = NO;
+
+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

Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig

@@ -0,0 +1,35 @@
+// Copyright (C) 2017-2023 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+HEADER_SEARCH_PATHS = Source Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/sdk/objc Source/webrtc/sdk/objc/base Source/webrtc/sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/sdk/objc/Framework/Classes/Common Source/webrtc/sdk/objc/Framework/Classes/Video Source/webrtc/sdk/objc/Framework/Classes/PeerConnection Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include Source/third_party/crc32c/config Source/third_party/crc32c/include Source/third_party/crc32c/src/include Source/third_party/libaom/source/libaom;
+USE_HEADERMAP = NO;
+
+WARNING_CFLAGS = -Wno-deprecated-declarations $(inherited);
+
+// FIXME: Set WEBRTC_USE_BUILTIN_ISAC_FIX and WEBRTC_USE_BUILTIN_ISAC_FLOAT for iOS and Mac
+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_H265 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 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 RTC_ENABLE_VP9 NO_MAIN_THREAD_WRAPPING RTC_DISABLE_TRACE_EVENTS WEBRTC_HAVE_SCTP WEBRTC_EXCLUDE_TRANSIENT_SUPPRESSOR WEBRTC_HAVE_DCSCTP $(inherited);
+
+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;
+GCC_PREPROCESSOR_DEFINITIONS[sdk=appletv*] = $(inherited) WEBRTC_IOS;
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphone*] = $(inherited) WEBRTC_IOS;