fixes

instrumentisto · Jan 20, 2025 · 694ec30 · 694ec30
1 parent 267202c
commit 694ec30
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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