diff --git a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h index b8f27e698c..21b154f8d1 100644 --- a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h +++ b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h @@ -33,8 +33,6 @@ class MockVCMReceiveCallback : public VCMReceiveCallback { MockVCMReceiveCallback() {} virtual ~MockVCMReceiveCallback() {} - // TODO(ilnik): Remove using ... once deprecation is done. - using VCMReceiveCallback::FrameToRender; MOCK_METHOD3(FrameToRender, int32_t(VideoFrame&, rtc::Optional, VideoContentType)); MOCK_METHOD1(ReceivedDecodedReferenceFrame, int32_t(const uint64_t)); diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/webrtc/modules/video_coding/include/video_coding_defines.h index 8eaac7462a..278a6b50fd 100644 --- a/webrtc/modules/video_coding/include/video_coding_defines.h +++ b/webrtc/modules/video_coding/include/video_coding_defines.h @@ -61,17 +61,10 @@ struct VCMFrameCount { // rendered. class VCMReceiveCallback { public: - // TODO(ilnik): Once deprecation is complete, change this to pure virtual. virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT rtc::Optional qp, - VideoContentType /*content_type*/) { - return FrameToRender(videoFrame, qp); - } - // DEPRECATED. Use the other overloaded version. - virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT - rtc::Optional qp) { - return -1; - } + VideoContentType /*content_type*/) = 0; + virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) { return -1; } diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h index 6f64934fc7..b670b12659 100644 --- a/webrtc/video/video_stream_decoder.h +++ b/webrtc/video/video_stream_decoder.h @@ -57,8 +57,6 @@ class VideoStreamDecoder : public VCMReceiveCallback, rtc::VideoSinkInterface* incoming_video_stream); ~VideoStreamDecoder(); - // TODO(ilnik): remove this once deprecated API is removed. - using VCMReceiveCallback::FrameToRender; // Implements VCMReceiveCallback. int32_t FrameToRender(VideoFrame& video_frame, rtc::Optional qp,