From 694ec303dea0a4d83728238f119f0e5decf04a4a Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Mon, 20 Jan 2025 09:46:20 -0300 Subject: [PATCH] fixes --- build/linux-arm64/Makefile | 3 +-- build/linux-x64/Makefile | 3 +-- patch/linux_clang_optional.patch | 7 +++---- patch/linux_emplace.patch | 14 -------------- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 patch/linux_emplace.patch diff --git a/build/linux-arm64/Makefile b/build/linux-arm64/Makefile index 0b2af545..6153631a 100644 --- a/build/linux-arm64/Makefile +++ b/build/linux-arm64/Makefile @@ -38,8 +38,7 @@ patch: common-patch patch -p2 < $(PATCH_DIR)/4k_linux.patch && \ patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \ patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch && \ - patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch && \ - patch -p2 < $(PATCH_DIR)/linux_emplace.patch + patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch .PHONY: build build: download patch diff --git a/build/linux-x64/Makefile b/build/linux-x64/Makefile index 53d74f07..8dc5c2d0 100644 --- a/build/linux-x64/Makefile +++ b/build/linux-x64/Makefile @@ -38,8 +38,7 @@ patch: common-patch patch -p2 < $(PATCH_DIR)/4k_linux.patch && \ patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \ patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch && \ - patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch && \ - patch -p2 < $(PATCH_DIR)/linux_emplace.patch + patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch .PHONY: build build: download patch diff --git a/patch/linux_clang_optional.patch b/patch/linux_clang_optional.patch index 96d3958f..d7676e6a 100644 --- a/patch/linux_clang_optional.patch +++ b/patch/linux_clang_optional.patch @@ -1,12 +1,11 @@ diff --git a/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h b/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h -index 425ca2a0c8..b45c6dd777 100644 +index a81e206..ee1c2ad 100644 --- a/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h +++ b/src/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h -@@ -124,7 +124,8 @@ class LossBasedBweV2 { - bool use_byte_loss_rate = false; - TimeDelta padding_duration = TimeDelta::Zero(); +@@ -129,6 +129,7 @@ class LossBasedBweV2 { bool bound_best_candidate = false; bool pace_at_loss_based_estimate = false; + double median_sending_rate_factor = 0.0; + Config() { } }; diff --git a/patch/linux_emplace.patch b/patch/linux_emplace.patch deleted file mode 100644 index 8afd31c8..00000000 --- a/patch/linux_emplace.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/media/engine/webrtc_video_engine.cc b/src/media/engine/webrtc_video_engine.cc -index d6b53ffa6b..a57af55409 100644 ---- a/src/media/engine/webrtc_video_engine.cc -+++ b/src/media/engine/webrtc_video_engine.cc -@@ -1995,7 +1995,8 @@ void WebRtcVideoSendChannel::WebRtcVideoSendStream::SetCodec( - stream_config.raw_payload = - cs.codec.packetization == kPacketizationParamRaw; - if (i < parameters_.config.rtp.rtx.ssrcs.size()) { -- auto& rtx = stream_config.rtx.emplace(); -+ auto& rtx = stream_config.rtx.emplace( -+ decltype(stream_config.rtx)::value_type()); - rtx.ssrc = parameters_.config.rtp.rtx.ssrcs[i]; - rtx.payload_type = cs.rtx_payload_type; - }