From 1e42d83db4f1fb246dc992e22f6cbe6182072157 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 15 Aug 2023 16:13:37 +0200 Subject: [PATCH] Make VCMReceiveCallback::FrameToRender pure virtual again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit after the downstream tests have been updated. BUG=webrtc:14728 Change-Id: I9cf7eb607f8b26acf985d90625e55bac257a2606 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/316220 Reviewed-by: Henrik Boström Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/main@{#40557} --- modules/video_coding/include/video_coding_defines.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h index bd71a8d90f..cbd420732c 100644 --- a/modules/video_coding/include/video_coding_defines.h +++ b/modules/video_coding/include/video_coding_defines.h @@ -50,22 +50,11 @@ enum VCMVideoProtection { // rendered. class VCMReceiveCallback { public: - // TODO(bugs.webrtc.org/14728): make pure virtual again. virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT absl::optional qp, TimeDelta decode_time, VideoContentType content_type, - VideoFrameType frame_type) { - return FrameToRender(videoFrame, qp, decode_time, content_type); - } - // TODO(bugs.webrtc.org/14728): remove this signature. - virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT - absl::optional qp, - TimeDelta decode_time, - VideoContentType content_type) { - return FrameToRender(videoFrame, qp, decode_time, content_type, - VideoFrameType::kEmptyFrame); - } + VideoFrameType frame_type) = 0; virtual void OnDroppedFrames(uint32_t frames_dropped);