diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc index 4aaf12c8a1..7070fa2563 100644 --- a/modules/video_coding/generic_decoder.cc +++ b/modules/video_coding/generic_decoder.cc @@ -19,7 +19,6 @@ #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" @@ -30,15 +29,9 @@ VCMDecodedFrameCallback::VCMDecodedFrameCallback( VCMTiming* timing, Clock* clock, const FieldTrialsView& field_trials) - : _clock(clock), - _timing(timing), - _timestampMap(kDecoderFrameMemoryLength), - _extra_decode_time("t", absl::nullopt) { + : _clock(clock), _timing(timing), _timestampMap(kDecoderFrameMemoryLength) { ntp_offset_ = _clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds(); - - ParseFieldTrial({&_extra_decode_time}, - field_trials.Lookup("WebRTC-SlowDownDecoder")); } VCMDecodedFrameCallback::~VCMDecodedFrameCallback() {} @@ -76,11 +69,6 @@ int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage, void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage, absl::optional decode_time_ms, absl::optional qp) { - // Wait some extra time to simulate a slow decoder. - if (_extra_decode_time) { - rtc::Thread::SleepMs(_extra_decode_time->ms()); - } - RTC_DCHECK(_receiveCallback) << "Callback must not be null at this point"; TRACE_EVENT_INSTANT1("webrtc", "VCMDecodedFrameCallback::Decoded", "timestamp", decodedImage.timestamp()); diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h index 554b743780..efb77bbbd2 100644 --- a/modules/video_coding/generic_decoder.h +++ b/modules/video_coding/generic_decoder.h @@ -15,13 +15,11 @@ #include "api/field_trials_view.h" #include "api/sequence_checker.h" -#include "api/units/time_delta.h" #include "api/video_codecs/video_decoder.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/timestamp_map.h" #include "modules/video_coding/timing.h" -#include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/synchronization/mutex.h" namespace webrtc { @@ -64,8 +62,6 @@ class VCMDecodedFrameCallback : public DecodedImageCallback { Mutex lock_; VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_); int64_t ntp_offset_; - // Set by the field trial WebRTC-SlowDownDecoder to simulate a slow decoder. - FieldTrialOptional _extra_decode_time; }; class VCMGenericDecoder {