diff --git a/api/video_codecs/video_decoder.cc b/api/video_codecs/video_decoder.cc index fee3ec6d42..04673e6c31 100644 --- a/api/video_codecs/video_decoder.cc +++ b/api/video_codecs/video_decoder.cc @@ -32,10 +32,6 @@ VideoDecoder::DecoderInfo VideoDecoder::GetDecoderInfo() const { return info; } -bool VideoDecoder::PrefersLateDecoding() const { - return true; -} - const char* VideoDecoder::ImplementationName() const { return "unknown"; } diff --git a/api/video_codecs/video_decoder.h b/api/video_codecs/video_decoder.h index a6af3f22e9..04052de08b 100644 --- a/api/video_codecs/video_decoder.h +++ b/api/video_codecs/video_decoder.h @@ -70,12 +70,6 @@ class RTC_EXPORT VideoDecoder { virtual DecoderInfo GetDecoderInfo() const; - // Deprecated, use GetDecoderInfo().prefers_late_decoding instead. - // Returns true if the decoder prefer to decode frames late. - // That is, it can not decode infinite number of frames before the decoded - // frame is consumed. - // TODO(bugs.webrtc.org/12271): Remove when downstream has been updated. - virtual bool PrefersLateDecoding() const; // Deprecated, use GetDecoderInfo().implementation_name instead. virtual const char* ImplementationName() const; }; diff --git a/sdk/android/api/org/webrtc/VideoDecoder.java b/sdk/android/api/org/webrtc/VideoDecoder.java index f4d3b8f4d4..a80fa4fef2 100644 --- a/sdk/android/api/org/webrtc/VideoDecoder.java +++ b/sdk/android/api/org/webrtc/VideoDecoder.java @@ -86,14 +86,6 @@ public interface VideoDecoder { * Request the decoder to decode a frame. */ @CalledByNative VideoCodecStatus decode(EncodedImage frame, DecodeInfo info); - /** - * The decoder should return true if it prefers late decoding. That is, it can not decode - * infinite number of frames before the decoded frame is consumed. - */ - // TODO(bugs.webrtc.org/12271): Remove when downstream has been updated. - default boolean getPrefersLateDecoding() { - return true; - } /** * Should return a descriptive name for the implementation. Gets called once and cached. May be * called from arbitrary thread.