From a028a1a0f7b8786408e9dccb3f0ae819cf353201 Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Fri, 11 Sep 2020 16:05:56 +0200
Subject: [PATCH] Removed old OnDecodedFrame callback.

Bug: webrtc:9106
Change-Id: Idb13ca9984f1e74585640e78da60a291218f4ade
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/183981
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32093}
---
 api/video/video_stream_decoder.h                  | 10 +---------
 api/video/video_stream_decoder_create_unittest.cc |  6 +++---
 video/video_stream_decoder_impl_unittest.cc       | 12 ++++++------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/api/video/video_stream_decoder.h b/api/video/video_stream_decoder.h
index 48e6b195ff..dc44f6a91c 100644
--- a/api/video/video_stream_decoder.h
+++ b/api/video/video_stream_decoder.h
@@ -43,16 +43,8 @@ class VideoStreamDecoderInterface {
     virtual void OnContinuousUntil(
         const video_coding::VideoLayerFrameId& key) = 0;
 
-    // Called with the decoded frame.
     virtual void OnDecodedFrame(VideoFrame frame,
-                                absl::optional<int> decode_time_ms,
-                                absl::optional<int> qp) {}
-
-    // TODO(philipel): Make pure virtual and remove old function above when
-    //                 it is no longer used.
-    virtual void OnDecodedFrame(VideoFrame frame, const FrameInfo& meta_info) {
-      OnDecodedFrame(std::move(frame), meta_info.decode_time_ms, meta_info.qp);
-    }
+                                const FrameInfo& frame_info) = 0;
   };
 
   virtual ~VideoStreamDecoderInterface() = default;
diff --git a/api/video/video_stream_decoder_create_unittest.cc b/api/video/video_stream_decoder_create_unittest.cc
index 7b142a90b9..93edb4b8a2 100644
--- a/api/video/video_stream_decoder_create_unittest.cc
+++ b/api/video/video_stream_decoder_create_unittest.cc
@@ -22,9 +22,9 @@ class NullCallbacks : public VideoStreamDecoderInterface::Callbacks {
   ~NullCallbacks() override = default;
   void OnNonDecodableState() override {}
   void OnContinuousUntil(const video_coding::VideoLayerFrameId& key) override {}
-  void OnDecodedFrame(VideoFrame decodedImage,
-                      absl::optional<int> decode_time_ms,
-                      absl::optional<int> qp) override {}
+  void OnDecodedFrame(VideoFrame frame,
+                      const VideoStreamDecoderInterface::Callbacks::FrameInfo&
+                          frame_info) override {}
 };
 
 TEST(VideoStreamDecoderCreate, CreateVideoStreamDecoder) {
diff --git a/video/video_stream_decoder_impl_unittest.cc b/video/video_stream_decoder_impl_unittest.cc
index a45a12ccae..a957f01ead 100644
--- a/video/video_stream_decoder_impl_unittest.cc
+++ b/video/video_stream_decoder_impl_unittest.cc
@@ -32,12 +32,12 @@ class MockVideoStreamDecoderCallbacks
               OnContinuousUntil,
               (const video_coding::VideoLayerFrameId& key),
               (override));
-  MOCK_METHOD(void,
-              OnDecodedFrame,
-              (VideoFrame decodedImage,
-               absl::optional<int> decode_time_ms,
-               absl::optional<int> qp),
-              (override));
+  MOCK_METHOD(
+      void,
+      OnDecodedFrame,
+      (VideoFrame frame,
+       const VideoStreamDecoderInterface::Callbacks::FrameInfo& frame_info),
+      (override));
 };
 
 class StubVideoDecoder : public VideoDecoder {