admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate simulcast config field trials in VideoCodecTester

Browse Source 
Instead of passing them through the global field trials string

Bug: webrtc:42220378
Change-Id: I75e406a9fb8bbee8de47f20ff8c68a1b49dfbf5a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358141
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42697}
This commit is contained in:
Danil Chapovalov 2024-07-30 18:32:35 +02:00 committed by WebRTC LUCI CQ
parent 6b0de3f05b
commit 79518639d1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/BUILD.gn
View File

@ -1354,7 +1354,6 @@ rtc_library("video_codec_tester") {
"video_codec_tester.h",
]
deps = [
":scoped_key_value_config",
":video_frame_writer",
":video_test_support",
"../api:array_view",
@ -1391,8 +1390,6 @@ rtc_library("video_codec_tester") {
"../rtc_base:timeutils",
"../rtc_base/synchronization:mutex",
"../system_wrappers",
"../system_wrappers:field_trial",
"../test:explicit_key_value_config",
"../test:fileutils",
"../video/config:streams_config",
"//third_party/abseil-cpp/absl/strings",

9
test/video_codec_tester.cc
View File

@ -11,6 +11,7 @@
#include "test/video_codec_tester.h"
#include <algorithm>
#include <numeric>
#include <set>
#include <tuple>
#include <utility>
@ -46,10 +47,7 @@
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/task_queue_for_test.h"
#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/sleep.h"
#include "test/explicit_key_value_config.h"
#include "test/scoped_key_value_config.h"
#include "test/testsupport/file_utils.h"
#include "test/testsupport/frame_reader.h"
#include "test/testsupport/video_frame_writer.h"
@ -1274,7 +1272,7 @@ class Encoder : public EncodedImageCallback {
Mutex mutex_;
};
void ConfigureSimulcast(VideoCodec* vc) {
void ConfigureSimulcast(const FieldTrialsView& field_trials, VideoCodec* vc) {
int num_spatial_layers =
ScalabilityModeToNumSpatialLayers(*vc->GetScalabilityMode());
int num_temporal_layers =
@ -1293,7 +1291,6 @@ void ConfigureSimulcast(VideoCodec* vc) {
return;
}
ExplicitKeyValueConfig field_trials(field_trial::GetFieldTrialString());
VideoEncoderConfig encoder_config;
encoder_config.codec_type = vc->codecType;
encoder_config.number_of_streams = num_spatial_layers;
@ -1424,7 +1421,7 @@ SplitBitrateAndUpdateScalabilityMode(const Environment& env,
case kVideoCodecVP8:
case kVideoCodecH264:
case kVideoCodecH265:
ConfigureSimulcast(&vc);
ConfigureSimulcast(env.field_trials(), &vc);
break;
case kVideoCodecVP9: {
const std::vector<SpatialLayer> spatialLayers = GetVp9SvcConfig(vc);