commit 65e3044b405f4ff23db4c16fd9e8e7c4f2f03347
author Marina Ciocea <marinaciocea@webrtc.org> Mon Aug 03 18:30:35 2020
committer Commit Bot <commit-bot@chromium.org> Mon Aug 03 18:31:07 2020
tree 284fb6ccdbcbda469271352f3c60e75203040eb3
parent fbbfc02698f5c286f993fb383e2bb59ad172056d

Revert "Add EncodedImageCallback::OnEncodedImage without RTPFragmentationHeader"

This reverts commit fdd41ecf6b05b02a1ee12583e537f1cdb5922919.

Reason for revert: Breaks WebRTC roll into Chrome: 
https://crrev.com/c/2335265

Sample failure:
https://ci.chromium.org/p/chromium/builders/try/linux_chromium_compile_dbg_ng/688153?


Original change's description:
> Add EncodedImageCallback::OnEncodedImage without RTPFragmentationHeader
> 
> RTPFragmentationHeader is no longer used by any webrtc code.
> 
> Bug: webrtc:6471
> Change-Id: I1362d58465c550f5c8e0a5b292dc0abcd6251431
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180120
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31833}

TBR=danilchap@webrtc.org,brandtr@webrtc.org,nisse@webrtc.org,srte@webrtc.org

Change-Id: I6bd021637b0c140f6625612caebdb5829decdfb0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:6471
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180821
Reviewed-by: Marina Ciocea <marinaciocea@webrtc.org>
Commit-Queue: Marina Ciocea <marinaciocea@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31839}

api/test/mock_video_encoder.h

diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h
index b4ae271..26d758f 100644
--- a/api/test/mock_video_encoder.h
+++ b/api/test/mock_video_encoder.h
@@ -26,10 +26,6 @@
                const CodecSpecificInfo*,
                const RTPFragmentationHeader*),
               (override));
-  MOCK_METHOD(Result,
-              OnEncodedImage,
-              (const EncodedImage&, const CodecSpecificInfo*),
-              (override));
   MOCK_METHOD(void, OnDroppedFrame, (DropReason reason), (override));
 };
 

api/video_codecs/video_encoder.cc

diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index ab946a2..4427d6c 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -18,19 +18,6 @@
 
 namespace webrtc {
 
-EncodedImageCallback::Result EncodedImageCallback::OnEncodedImage(
-    const EncodedImage& encoded_image,
-    const CodecSpecificInfo* codec_specific_info,
-    const RTPFragmentationHeader* /*fragmentation*/) {
-  return OnEncodedImage(encoded_image, codec_specific_info);
-}
-
-EncodedImageCallback::Result EncodedImageCallback::OnEncodedImage(
-    const EncodedImage& encoded_image,
-    const CodecSpecificInfo* codec_specific_info) {
-  return OnEncodedImage(encoded_image, codec_specific_info, nullptr);
-}
-
 // TODO(mflodman): Add default complexity for VP9 and VP9.
 VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
   VideoCodecVP8 vp8_settings;

api/video_codecs/video_encoder.h

diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
index c5b8553..064dc8f 100644
--- a/api/video_codecs/video_encoder.h
+++ b/api/video_codecs/video_encoder.h
@@ -73,16 +73,10 @@
   };
 
   // Callback function which is called when an image has been encoded.
-  // Deprecated, use OnEncodedImage below instead, see bugs.webrtc.org/6471
-  virtual Result OnEncodedImage(const EncodedImage& encoded_image,
-                                const CodecSpecificInfo* codec_specific_info,
-                                const RTPFragmentationHeader* fragmentation);
-
-  // Callback function which is called when an image has been encoded.
-  // TODO(bugs.webrtc.org/6471): Make pure virtual
-  // when OnEncodedImage above is deleted.
-  virtual Result OnEncodedImage(const EncodedImage& encoded_image,
-                                const CodecSpecificInfo* codec_specific_info);
+  virtual Result OnEncodedImage(
+      const EncodedImage& encoded_image,
+      const CodecSpecificInfo* codec_specific_info,
+      const RTPFragmentationHeader* fragmentation) = 0;
 
   virtual void OnDroppedFrame(DropReason reason) {}
 };