commit 9d8a40d9909b59faf2cbc8bb68285d310350b297
parent 199fafdc1ba275f1f794f3e61521d2f37ddc7fca
Author: Michael Froman <mfroman@mozilla.com>
Date: Wed, 8 Oct 2025 17:33:05 -0500
Bug 1993083 - Vendor libwebrtc from 26cfc77cc2
Upstream commit: https://webrtc.googlesource.com/src/+/26cfc77cc25366a8e5f0be33d311211a38e792ad
Do not set global field trials string in video loopback tools.
This tools rely on VideoQualityTest fixture that was migrated to use
propagated field trials that are populated from the same command line
flag. Setting global field trials string has no effect and is no longer
needed.
Bug: webrtc:419453427
Change-Id: Ida7e55c771456f33894d98c6bff318a7dfbe1a78
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398501
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45048}
Diffstat:
6 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:31:34.932748+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:32:56.980998+00:00.
# base of lastest vendoring
-4690e0b758
+26cfc77cc2
diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch
@@ -1253,7 +1253,7 @@ index c90d42d6e1..e0bb8bc2da 100644
rtc_library("call_config_utils") {
testonly = true
diff --git a/video/BUILD.gn b/video/BUILD.gn
-index 044a89e8ac..e81e0b0671 100644
+index c1acd56382..7abdf541f8 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -17,7 +17,7 @@ rtc_library("video_stream_encoder_interface") {
diff --git a/third_party/libwebrtc/video/BUILD.gn b/third_party/libwebrtc/video/BUILD.gn
@@ -724,11 +724,9 @@ if (rtc_include_tests) {
"../api/video_codecs:video_codecs_api",
"../rtc_base:checks",
"../rtc_base:logging",
- "../system_wrappers:field_trial",
"../test:run_test",
"../test:run_test_interface",
"../test:test_common",
- "../test:test_flags",
"../test:test_renderer",
"../test:test_support",
"//testing/gtest",
@@ -767,11 +765,9 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:stringutils",
- "../system_wrappers:field_trial",
"../test:run_test",
"../test:run_test_interface",
"../test:test_common",
- "../test:test_flags",
"../test:test_renderer",
"../test:test_support",
"//third_party/abseil-cpp/absl/flags:flag",
@@ -793,11 +789,9 @@ if (rtc_include_tests) {
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:stringutils",
- "../system_wrappers:field_trial",
"../test:run_test",
"../test:run_test_interface",
"../test:test_common",
- "../test:test_flags",
"../test:test_renderer",
"../test:test_support",
"//testing/gtest",
diff --git a/third_party/libwebrtc/video/screenshare_loopback.cc b/third_party/libwebrtc/video/screenshare_loopback.cc
@@ -25,10 +25,8 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/string_encode.h"
-#include "system_wrappers/include/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
-#include "test/test_flags.h"
#include "video/video_quality_test.h"
using ::webrtc::BitrateConstraints;
@@ -384,11 +382,6 @@ int main(int argc, char* argv[]) {
webrtc::LogMessage::SetLogToStderr(absl::GetFlag(FLAGS_logs));
- // InitFieldTrialsFromString stores the char*, so the char array must outlive
- // the application.
- const std::string field_trials = absl::GetFlag(FLAGS_force_fieldtrials);
- webrtc::field_trial::InitFieldTrialsFromString(field_trials.c_str());
-
webrtc::test::RunTest(Loopback);
return 0;
}
diff --git a/third_party/libwebrtc/video/sv_loopback.cc b/third_party/libwebrtc/video/sv_loopback.cc
@@ -24,10 +24,8 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/string_encode.h"
-#include "system_wrappers/include/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
-#include "test/test_flags.h"
#include "video/video_quality_test.h"
// Flags for video.
@@ -703,11 +701,6 @@ int main(int argc, char* argv[]) {
webrtc::LogMessage::SetLogToStderr(absl::GetFlag(FLAGS_logs));
- // InitFieldTrialsFromString stores the char*, so the char array must outlive
- // the application.
- const std::string field_trials = absl::GetFlag(FLAGS_force_fieldtrials);
- webrtc::field_trial::InitFieldTrialsFromString(field_trials.c_str());
-
webrtc::test::RunTest(webrtc::Loopback);
return 0;
}
diff --git a/third_party/libwebrtc/video/video_loopback.cc b/third_party/libwebrtc/video/video_loopback.cc
@@ -24,10 +24,8 @@
#include "api/video_codecs/video_codec.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "system_wrappers/include/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
-#include "test/test_flags.h"
#include "video/video_quality_test.h"
// Flags common with screenshare loopback, with different default values.
@@ -438,11 +436,6 @@ int RunLoopbackTest(int argc, char* argv[]) {
LogMessage::SetLogToStderr(absl::GetFlag(FLAGS_logs));
- // InitFieldTrialsFromString stores the char*, so the char array must outlive
- // the application.
- const std::string field_trials = absl::GetFlag(FLAGS_force_fieldtrials);
- field_trial::InitFieldTrialsFromString(field_trials.c_str());
-
test::RunTest(Loopback);
return 0;
}
