zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRTC-DeprecateGlobalFieldTrialString/Enabled/ - part 12/inf

Browse Source 
rename WebRtcKeyValueConfig to FieldTrialsView

Bug: webrtc:10335
Change-Id: If725bd498c4c3daf144bee638230fa089fdde833
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256965
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36365}
This commit is contained in:
Jonas Oreland
2022-03-29 11:04:48 +02:00
committed by WebRTC LUCI CQ
parent bddfa1d9de
commit e62c2f2c77
303 changed files with 785 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
View File

@ -96,7 +96,7 @@ ColorSpace ExtractVP9ColorSpace(vpx_color_space_t space_t,
LibvpxVp9Decoder::LibvpxVp9Decoder()
: LibvpxVp9Decoder(FieldTrialBasedConfig()) {}
LibvpxVp9Decoder::LibvpxVp9Decoder(const WebRtcKeyValueConfig& trials)
LibvpxVp9Decoder::LibvpxVp9Decoder(const FieldTrialsView& trials)
: decode_complete_callback_(nullptr),
inited_(false),
decoder_(nullptr),

4
modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h
View File

@ -14,7 +14,7 @@
#ifdef RTC_ENABLE_VP9
#include "api/transport/webrtc_key_value_config.h"
#include "api/field_trials_view.h"
#include "api/video_codecs/video_decoder.h"
#include "common_video/include/video_frame_buffer_pool.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
@ -26,7 +26,7 @@ namespace webrtc {
class LibvpxVp9Decoder : public VP9Decoder {
public:
LibvpxVp9Decoder();
explicit LibvpxVp9Decoder(const WebRtcKeyValueConfig& trials);
explicit LibvpxVp9Decoder(const FieldTrialsView& trials);
virtual ~LibvpxVp9Decoder();

9
modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
View File

@ -194,7 +194,7 @@ void LibvpxVp9Encoder::EncoderOutputCodedPacketCallback(vpx_codec_cx_pkt* pkt,
LibvpxVp9Encoder::LibvpxVp9Encoder(const cricket::VideoCodec& codec,
std::unique_ptr<LibvpxInterface> interface,
const WebRtcKeyValueConfig& trials)
const FieldTrialsView& trials)
: libvpx_(std::move(interface)),
encoded_image_(),
encoded_complete_callback_(nullptr),
@ -1811,8 +1811,7 @@ size_t LibvpxVp9Encoder::SteadyStateSize(int sid, int tid) {
// static
LibvpxVp9Encoder::VariableFramerateExperiment
LibvpxVp9Encoder::ParseVariableFramerateConfig(
const WebRtcKeyValueConfig& trials) {
LibvpxVp9Encoder::ParseVariableFramerateConfig(const FieldTrialsView& trials) {
FieldTrialFlag enabled = FieldTrialFlag("Enabled");
FieldTrialParameter<double> framerate_limit("min_fps", 5.0);
FieldTrialParameter<int> qp("min_qp", 32);
@ -1834,7 +1833,7 @@ LibvpxVp9Encoder::ParseVariableFramerateConfig(
// static
LibvpxVp9Encoder::QualityScalerExperiment
LibvpxVp9Encoder::ParseQualityScalerConfig(const WebRtcKeyValueConfig& trials) {
LibvpxVp9Encoder::ParseQualityScalerConfig(const FieldTrialsView& trials) {
FieldTrialFlag disabled = FieldTrialFlag("Disabled");
FieldTrialParameter<int> low_qp("low_qp", kLowVp9QpThreshold);
FieldTrialParameter<int> high_qp("hihg_qp", kHighVp9QpThreshold);
@ -1873,7 +1872,7 @@ void LibvpxVp9Encoder::UpdatePerformanceFlags() {
// static
LibvpxVp9Encoder::PerformanceFlags
LibvpxVp9Encoder::ParsePerformanceFlagsFromTrials(
const WebRtcKeyValueConfig& trials) {
const FieldTrialsView& trials) {
struct Params : public PerformanceFlags::ParameterSet {
int min_pixel_count = 0;
};

10
modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h
View File

@ -19,7 +19,7 @@
#include <vector>
#include "api/fec_controller_override.h"
#include "api/transport/webrtc_key_value_config.h"
#include "api/field_trials_view.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/vp9_profile.h"
#include "common_video/include/video_frame_buffer_pool.h"
@ -37,7 +37,7 @@ class LibvpxVp9Encoder : public VP9Encoder {
public:
LibvpxVp9Encoder(const cricket::VideoCodec& codec,
std::unique_ptr<LibvpxInterface> interface,
const WebRtcKeyValueConfig& trials);
const FieldTrialsView& trials);
~LibvpxVp9Encoder() override;
@ -190,7 +190,7 @@ class LibvpxVp9Encoder : public VP9Encoder {
int frames_before_steady_state;
} variable_framerate_experiment_;
static VariableFramerateExperiment ParseVariableFramerateConfig(
const WebRtcKeyValueConfig& trials);
const FieldTrialsView& trials);
FramerateControllerDeprecated variable_framerate_controller_;
const struct QualityScalerExperiment {
@ -199,7 +199,7 @@ class LibvpxVp9Encoder : public VP9Encoder {
bool enabled;
} quality_scaler_experiment_;
static QualityScalerExperiment ParseQualityScalerConfig(
const WebRtcKeyValueConfig& trials);
const FieldTrialsView& trials);
const bool external_ref_ctrl_;
// Flags that can affect speed vs quality tradeoff, and are configureable per
@ -234,7 +234,7 @@ class LibvpxVp9Encoder : public VP9Encoder {
performance_flags_by_spatial_index_;
void UpdatePerformanceFlags();
static PerformanceFlags ParsePerformanceFlagsFromTrials(
const WebRtcKeyValueConfig& trials);
const FieldTrialsView& trials);
static PerformanceFlags GetDefaultPerformanceFlags();
int num_steady_state_frames_;