Remove webrtc::VideoDecoder::PrefersLateDecoding.
This is just general cleanup.
The assumed behavior is late decoding, and this function is not used to make any decision (except in the deprecated jitter buffer).
Bug: webrtc:12271
Change-Id: Ifb48186d55903f068f25e44c5f73e7a724f6f456
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/200804
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32940}
diff --git a/modules/video_coding/decoder_database.cc b/modules/video_coding/decoder_database.cc
index a7a4b8f..594ca86 100644
--- a/modules/video_coding/decoder_database.cc
+++ b/modules/video_coding/decoder_database.cc
@@ -133,10 +133,6 @@
return ptr_decoder_.get();
}
-bool VCMDecoderDataBase::PrefersLateDecoding() const {
- return ptr_decoder_ ? ptr_decoder_->PrefersLateDecoding() : true;
-}
-
std::unique_ptr<VCMGenericDecoder> VCMDecoderDataBase::CreateAndInitDecoder(
const VCMEncodedFrame& frame,
VideoCodec* new_codec) const {
diff --git a/modules/video_coding/decoder_database.h b/modules/video_coding/decoder_database.h
index abfd81e..f7c5d70 100644
--- a/modules/video_coding/decoder_database.h
+++ b/modules/video_coding/decoder_database.h
@@ -59,10 +59,6 @@
const VCMEncodedFrame& frame,
VCMDecodedFrameCallback* decoded_frame_callback);
- // Returns true if the currently active decoder prefer to decode frames late.
- // That means that frames must be decoded near the render times stamp.
- bool PrefersLateDecoding() const;
-
private:
typedef std::map<uint8_t, VCMDecoderMapItem*> DecoderMap;
typedef std::map<uint8_t, VCMExtDecoderMapItem*> ExternalDecoderMap;
diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 7905792..d237d0c 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -294,8 +294,4 @@
return decoder_->RegisterDecodeCompleteCallback(callback);
}
-bool VCMGenericDecoder::PrefersLateDecoding() const {
- return decoder_->PrefersLateDecoding();
-}
-
} // namespace webrtc
diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
index 8481fdc..bd3620d 100644
--- a/modules/video_coding/generic_decoder.h
+++ b/modules/video_coding/generic_decoder.h
@@ -111,7 +111,6 @@
*/
int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
- bool PrefersLateDecoding() const;
bool IsSameDecoder(VideoDecoder* decoder) const {
return decoder_.get() == decoder;
}
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index c2c8f8a..23c251f 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -173,8 +173,7 @@
// Should be called as often as possible to get the most out of the decoder.
int32_t VideoReceiver::Decode(uint16_t maxWaitTimeMs) {
RTC_DCHECK_RUN_ON(&decoder_thread_checker_);
- VCMEncodedFrame* frame = _receiver.FrameForDecoding(
- maxWaitTimeMs, _codecDataBase.PrefersLateDecoding());
+ VCMEncodedFrame* frame = _receiver.FrameForDecoding(maxWaitTimeMs, true);
if (!frame)
return VCM_FRAME_NOT_READY;