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

6
video/video_stream_decoder_impl.h
View File

@ -16,10 +16,10 @@
#include <utility>
#include "absl/types/optional.h"
#include "api/field_trials_view.h"
#include "api/sequence_checker.h"
#include "api/transport/field_trial_based_config.h"
#include "api/video/video_stream_decoder.h"
#include "api/webrtc_key_value_config.h"
#include "modules/video_coding/frame_buffer2.h"
#include "modules/video_coding/timing.h"
#include "rtc_base/memory/always_valid_pointer.h"
@ -37,7 +37,7 @@ class VideoStreamDecoderImpl : public VideoStreamDecoderInterface {
VideoDecoderFactory* decoder_factory,
TaskQueueFactory* task_queue_factory,
std::map<int, std::pair<SdpVideoFormat, int>> decoder_settings,
const WebRtcKeyValueConfig* field_trials);
const FieldTrialsView* field_trials);
~VideoStreamDecoderImpl() override;
@ -86,7 +86,7 @@ class VideoStreamDecoderImpl : public VideoStreamDecoderInterface {
VideoStreamDecoderImpl::DecodeResult DecodeFrame(
std::unique_ptr<EncodedFrame> frame) RTC_RUN_ON(decode_queue_);
AlwaysValidPointer<const WebRtcKeyValueConfig, FieldTrialBasedConfig>
AlwaysValidPointer<const FieldTrialsView, FieldTrialBasedConfig>
field_trials_;
VCMTiming timing_;
DecodeCallbacks decode_callbacks_;