diff --git a/api/test/mock_video_decoder.h b/api/test/mock_video_decoder.h index 8719422b41..e7d42098c4 100644 --- a/api/test/mock_video_decoder.h +++ b/api/test/mock_video_decoder.h @@ -29,7 +29,6 @@ class MockDecodedImageCallback : public DecodedImageCallback { void(VideoFrame& decodedImage, // NOLINT absl::optional decode_time_ms, absl::optional qp)); - MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId)); }; class MockVideoDecoder : public VideoDecoder { diff --git a/api/video_codecs/video_decoder.cc b/api/video_codecs/video_decoder.cc index 1044ae4d39..b181323911 100644 --- a/api/video_codecs/video_decoder.cc +++ b/api/video_codecs/video_decoder.cc @@ -24,10 +24,6 @@ void DecodedImageCallback::Decoded(VideoFrame& decodedImage, Decoded(decodedImage, decode_time_ms.value_or(-1)); } -int32_t DecodedImageCallback::ReceivedDecodedFrame(const uint64_t pictureId) { - return -1; -} - bool VideoDecoder::PrefersLateDecoding() const { return true; } diff --git a/api/video_codecs/video_decoder.h b/api/video_codecs/video_decoder.h index e9039343c4..266d653693 100644 --- a/api/video_codecs/video_decoder.h +++ b/api/video_codecs/video_decoder.h @@ -38,8 +38,6 @@ class RTC_EXPORT DecodedImageCallback { virtual void Decoded(VideoFrame& decodedImage, absl::optional decode_time_ms, absl::optional qp); - - virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); }; class RTC_EXPORT VideoDecoder { diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc index c8085bbac2..cf986d6329 100644 --- a/modules/video_coding/generic_decoder.cc +++ b/modules/video_coding/generic_decoder.cc @@ -25,10 +25,7 @@ namespace webrtc { VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock) - : _clock(clock), - _timing(timing), - _timestampMap(kDecoderFrameMemoryLength), - _lastReceivedPictureID(0) { + : _clock(clock), _timing(timing), _timestampMap(kDecoderFrameMemoryLength) { ntp_offset_ = _clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds(); } @@ -147,16 +144,6 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage, _receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type); } -int32_t VCMDecodedFrameCallback::ReceivedDecodedFrame( - const uint64_t pictureId) { - _lastReceivedPictureID = pictureId; - return 0; -} - -uint64_t VCMDecodedFrameCallback::LastReceivedPictureID() const { - return _lastReceivedPictureID; -} - void VCMDecodedFrameCallback::OnDecoderImplementationName( const char* implementation_name) { _receiveCallback->OnDecoderImplementationName(implementation_name); diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h index a4cf9b4bda..36428fb9f3 100644 --- a/modules/video_coding/generic_decoder.h +++ b/modules/video_coding/generic_decoder.h @@ -48,9 +48,7 @@ class VCMDecodedFrameCallback : public DecodedImageCallback { void Decoded(VideoFrame& decodedImage, absl::optional decode_time_ms, absl::optional qp) override; - int32_t ReceivedDecodedFrame(const uint64_t pictureId) override; - uint64_t LastReceivedPictureID() const; void OnDecoderImplementationName(const char* implementation_name); void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); @@ -69,7 +67,6 @@ class VCMDecodedFrameCallback : public DecodedImageCallback { VCMTiming* _timing; rtc::CriticalSection lock_; VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_); - uint64_t _lastReceivedPictureID; int64_t ntp_offset_; }; diff --git a/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.cc b/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.cc index 0acfa0d938..6d8ba0fba2 100644 --- a/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.cc +++ b/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.cc @@ -175,13 +175,6 @@ void QualityAnalyzingVideoDecoder::DecoderCallback::Decoded( delegate_callback_->Decoded(decodedImage, decode_time_ms, qp); } -int32_t QualityAnalyzingVideoDecoder::DecoderCallback::ReceivedDecodedFrame( - const uint64_t pictureId) { - rtc::CritScope crit(&callback_lock_); - RTC_DCHECK(delegate_callback_); - return delegate_callback_->ReceivedDecodedFrame(pictureId); -} - int32_t QualityAnalyzingVideoDecoder::DecoderCallback::IrrelevantSimulcastStreamDecoded( uint16_t frame_id, diff --git a/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.h b/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.h index 50ccc23d54..94dd13bd59 100644 --- a/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.h +++ b/test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.h @@ -84,7 +84,6 @@ class QualityAnalyzingVideoDecoder : public VideoDecoder { void Decoded(VideoFrame& decodedImage, absl::optional decode_time_ms, absl::optional qp) override; - int32_t ReceivedDecodedFrame(uint64_t pictureId) override; int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id, int64_t timestamp_ms);