From 155eab8946b62448803ea6181ab754463d7fc2d7 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Mon, 17 May 2021 02:34:32 +0400 Subject: [PATCH] Update webrtc --- Telegram/BUILD | 24 ++++++++++++ submodules/TgVoipWebrtc/tgcalls | 2 +- third-party/webrtc/BUILD | 65 ++++++++++++++++----------------- third-party/webrtc/webrtc | 2 +- 4 files changed, 58 insertions(+), 35 deletions(-) diff --git a/Telegram/BUILD b/Telegram/BUILD index f3af41994c..d1f58bd9f1 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -1819,3 +1819,27 @@ ios_application( ":Lib", ], ) + +# a temporary target used to simplify webrtc build tests +ios_application( + name = "webrtc_build_test", + bundle_id = "{telegram_bundle_id}".format( + telegram_bundle_id = telegram_bundle_id, + ), + families = ["iphone", "ipad"], + minimum_os_version = "9.0", + provisioning_profile = select({ + ":disableProvisioningProfilesSetting": None, + "//conditions:default": "@build_configuration//provisioning:Telegram.mobileprovision", + }), + entitlements = ":TelegramEntitlements.entitlements", + infoplists = [ + ":TelegramInfoPlist", + ":BuildNumberInfoPlist", + ":VersionInfoPlist", + ":UrlTypesInfoPlist", + ], + deps = [ + "//third-party/webrtc:webrtc_lib", + ], +) diff --git a/submodules/TgVoipWebrtc/tgcalls b/submodules/TgVoipWebrtc/tgcalls index 0cdddae960..1777fdf141 160000 --- a/submodules/TgVoipWebrtc/tgcalls +++ b/submodules/TgVoipWebrtc/tgcalls @@ -1 +1 @@ -Subproject commit 0cdddae960951aca74907685d7adb56a0d1efcb8 +Subproject commit 1777fdf141ffa31bda158627345518b91834bab8 diff --git a/third-party/webrtc/BUILD b/third-party/webrtc/BUILD index 21d6eca221..0f53ad90b8 100644 --- a/third-party/webrtc/BUILD +++ b/third-party/webrtc/BUILD @@ -340,7 +340,6 @@ webrtc_sources = [ "rtc_base/system/file_wrapper.h", "rtc_base/task_utils/repeating_task.h", "rtc_base/task_queue_stdlib.h", - "rtc_base/synchronization/sequence_checker.h", "rtc_base/synchronization/yield_policy.h", "rtc_base/string_utils.h", "rtc_base/strings/audio_format_to_string.h", @@ -352,7 +351,6 @@ webrtc_sources = [ "rtc_base/ssl_identity.h", "rtc_base/ssl_certificate.h", "rtc_base/socket.h", - "rtc_base/signal_thread.h", "rtc_base/rtc_certificate.h", "rtc_base/rate_tracker.h", "rtc_base/rate_statistics.h", @@ -533,7 +531,6 @@ webrtc_sources = [ "rtc_base/string_utils.cc", "rtc_base/strings/audio_format_to_string.cc", "rtc_base/strings/string_builder.cc", - "rtc_base/synchronization/sequence_checker.cc", "rtc_base/synchronization/yield_policy.cc", "rtc_base/synchronization/yield.h", "rtc_base/synchronization/yield.cc", @@ -643,7 +640,6 @@ webrtc_sources = [ "api/video/video_frame_buffer.cc", "api/video/video_source_interface.cc", "api/video/video_stream_decoder_create.cc", - "api/video/video_stream_encoder_create.cc", "api/video/video_timing.cc", "api/video_codecs/builtin_video_decoder_factory.cc", "api/video_codecs/builtin_video_encoder_factory.cc", @@ -667,7 +663,6 @@ webrtc_sources = [ "pc/audio_track.cc", "pc/channel.cc", "pc/channel_manager.cc", - "pc/composite_rtp_transport.cc", "pc/data_channel_controller.cc", "pc/dtls_srtp_transport.h", "pc/dtls_srtp_transport.cc", @@ -736,7 +731,6 @@ webrtc_sources = [ "media/base/vp9_profile.cc", "media/base/adapted_video_track_source.h", "media/engine/adm_helpers.cc", - "media/engine/constants.cc", "media/engine/encoder_simulcast_proxy.cc", "media/engine/internal_decoder_factory.cc", "media/engine/internal_encoder_factory.cc", @@ -1051,7 +1045,6 @@ webrtc_sources = [ "modules/audio_processing/agc2/adaptive_agc.cc", "modules/audio_processing/agc2/adaptive_digital_gain_applier.cc", "modules/audio_processing/agc2/adaptive_mode_level_estimator.cc", - "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc", "modules/audio_processing/agc2/agc2_testing_common.cc", "modules/audio_processing/agc2/biquad_filter.cc", "modules/audio_processing/agc2/compute_interpolated_gain_curve.cc", @@ -1556,7 +1549,6 @@ webrtc_sources = [ "rtc_base/checks.h", "rtc_base/thread.h", "rtc_base/constructor_magic.h", - "rtc_base/deprecation.h", "api/rtp_packet_infos.h", "api/task_queue/task_queue_base.h", "rtc_base/thread_annotations.h", @@ -1651,7 +1643,6 @@ webrtc_sources = [ "api/video/video_rotation.h", "api/video/video_source_interface.h", "api/video/video_stream_decoder_create.h", - "api/video/video_stream_encoder_create.h", "api/video/video_timing.h", "api/video_codecs/builtin_video_decoder_factory.h", "api/video_codecs/builtin_video_encoder_factory.h", @@ -1790,7 +1781,6 @@ webrtc_sources = [ "media/base/video_source_base.h", "media/base/vp9_profile.h", "media/engine/adm_helpers.h", - "media/engine/constants.h", "media/engine/encoder_simulcast_proxy.h", "media/engine/internal_decoder_factory.h", "media/engine/internal_encoder_factory.h", @@ -1997,7 +1987,6 @@ webrtc_sources = [ "modules/audio_processing/agc2/adaptive_agc.h", "modules/audio_processing/agc2/adaptive_digital_gain_applier.h", "modules/audio_processing/agc2/adaptive_mode_level_estimator.h", - "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h", "modules/audio_processing/agc2/agc2_common.h", "modules/audio_processing/agc2/agc2_testing_common.h", "modules/audio_processing/agc2/biquad_filter.h", @@ -2321,7 +2310,6 @@ webrtc_sources = [ "pc/audio_track.h", "pc/channel.h", "pc/channel_manager.h", - "pc/composite_rtp_transport.h", "pc/data_channel_controller.h", "pc/dtls_transport.h", "pc/dtmf_sender.h", @@ -2433,7 +2421,6 @@ webrtc_sources = [ "p2p/base/ice_controller_factory_interface.h", "rtc_base/async_invoker_inl.h", "rtc_base/buffer.h", - "rtc_base/callback.h", "rtc_base/compile_assert_c.h", "rtc_base/dscp.h", "rtc_base/gtest_prod_util.h", @@ -2447,7 +2434,6 @@ webrtc_sources = [ "rtc_base/sanitizer.h", "rtc_base/system/rtc_export_template.h", "rtc_base/system/unused.h", - "rtc_base/thread_checker.h", "rtc_base/time_utils.h", "rtc_base/units/unit_base.h", "video/adaptation/encode_usage_resource.h", @@ -2538,7 +2524,6 @@ webrtc_sources = [ "modules/utility/include/process_thread.h", "modules/video_coding/codecs/vp9/include/vp9_globals.h", "pc/rtp_transport_internal.h", - "rtc_base/bind.h", "rtc_base/mdns_responder_interface.h", "rtc_base/message_buffer_reader.h", "rtc_base/numerics/running_statistics.h", @@ -2681,7 +2666,6 @@ webrtc_sources = [ "p2p/base/udp_port.h", "pc/peer_connection_internal.h", "pc/used_ids.h", - "rtc_base/keep_ref_until_done.h", "rtc_base/numerics/divide_round.h", "rtc_base/system/thread_registry.h", "rtc_base/one_time_event.h", @@ -2771,24 +2755,8 @@ webrtc_sources = [ "modules/video_coding/svc/svc_rate_allocator.cc", "modules/video_coding/svc/scalability_structure_full_svc.cc", "modules/video_coding/svc/scalability_structure_key_svc.cc", - "modules/video_coding/svc/scalability_structure_l1t3.h", - "modules/video_coding/svc/scalability_structure_l1t3.cc", - "modules/video_coding/svc/scalability_structure_l2t1.h", - "modules/video_coding/svc/scalability_structure_l2t1.cc", - "modules/video_coding/svc/scalability_structure_l1t2.h", - "modules/video_coding/svc/scalability_structure_l1t2.cc", - "modules/video_coding/svc/scalability_structure_l3t3.h", - "modules/video_coding/svc/scalability_structure_l3t3.cc", - "modules/video_coding/svc/scalability_structure_l3t1.h", - "modules/video_coding/svc/scalability_structure_l3t1.cc", - "modules/video_coding/svc/scalability_structure_l2t2.h", - "modules/video_coding/svc/scalability_structure_l2t2.cc", "modules/video_coding/svc/scalability_structure_l2t2_key_shift.h", "modules/video_coding/svc/scalability_structure_l2t2_key_shift.cc", - "modules/video_coding/svc/scalability_structure_s2t1.h", - "modules/video_coding/svc/scalability_structure_s2t1.cc", - "modules/video_coding/svc/scalability_structure_l2t1h.h", - "modules/video_coding/svc/scalability_structure_l2t1h.cc", "pc/connection_context.h", "pc/connection_context.cc", "pc/data_channel_utils.h", @@ -2816,7 +2784,6 @@ webrtc_sources = [ "pc/stats_collector_interface.h", "rtc_base/callback_list.h", "rtc_base/callback_list.cc", - "rtc_base/deprecated/signal_thread.h", "call/adaptation/broadcast_resource_listener.h", "call/adaptation/broadcast_resource_listener.cc", "call/adaptation/video_stream_input_state.h", @@ -2885,6 +2852,25 @@ webrtc_sources = [ "video/video_stream_decoder2.cc", "modules/video_coding/nack_module2.h", "modules/video_coding/nack_module2.cc", + "api/sequence_checker.h", + "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h", + "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h", + "modules/rtp_rtcp/source/packet_sequencer.h", + "modules/rtp_rtcp/source/packet_sequencer.cc", + "modules/video_coding/svc/scalability_structure_full_svc.h", + "modules/video_coding/svc/scalability_structure_key_svc.h", + "rtc_base/async_resolver.h", + "rtc_base/async_resolver.cc", + "rtc_base/experiments/encoder_info_settings.h", + "rtc_base/experiments/encoder_info_settings.cc", + "rtc_base/system_time.h", + "rtc_base/system_time.cc", + "rtc_base/synchronization/sequence_checker_internal.h", + "rtc_base/synchronization/sequence_checker_internal.cc", + "rtc_base/internal/default_socket_server.h", + "rtc_base/internal/default_socket_server.cc", + "modules/video_coding/svc/scalability_structure_simulcast.h", + "modules/video_coding/svc/scalability_structure_simulcast.cc", ] ios_objc_sources = [ @@ -3154,6 +3140,7 @@ ios_sources = [ "objc/components/network/RTCNetworkMonitor.h", "objc/components/network/RTCNetworkMonitor+Private.h", "objc/components/network/RTCNetworkMonitor.mm", + "objc/native/src/network_monitor_observer.h", ] common_arm_specific_sources = [webrtc_source_dir + "/" + path for path in [ @@ -3589,8 +3576,20 @@ objc_library( ":libyuv", "//third-party/libvpx:vpx", ], + sdk_frameworks = [ + "AVFoundation", + "AudioToolbox", + "VideoToolbox", + "UIKit", + "CoreMedia", + "CoreVideo", + "OpenGLES", + "CoreGraphics", + "QuartzCore", + ], weak_sdk_frameworks = [ "Network", + "Metal", ], visibility = ["//visibility:public"], ) diff --git a/third-party/webrtc/webrtc b/third-party/webrtc/webrtc index 1829cfe837..f89c415fb9 160000 --- a/third-party/webrtc/webrtc +++ b/third-party/webrtc/webrtc @@ -1 +1 @@ -Subproject commit 1829cfe8371d479f254d9783ebe66fc562d30dba +Subproject commit f89c415fb9fdfb00b765ab38c341be863dd069eb