From 65e3044b405f4ff23db4c16fd9e8e7c4f2f03347 Mon Sep 17 00:00:00 2001 From: Marina Ciocea Date: Mon, 3 Aug 2020 18:30:35 +0000 Subject: [PATCH] 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 > Reviewed-by: Rasmus Brandt > Reviewed-by: Niels Moller > Commit-Queue: Danil Chapovalov > 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 Commit-Queue: Marina Ciocea Cr-Commit-Position: refs/heads/master@{#31839} --- api/test/mock_video_encoder.h | 4 ---- api/video_codecs/video_encoder.cc | 13 ------------- api/video_codecs/video_encoder.h | 14 ++++---------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h index b4ae27106a..26d758fd6a 100644 --- a/api/test/mock_video_encoder.h +++ b/api/test/mock_video_encoder.h @@ -26,10 +26,6 @@ class MockEncodedImageCallback : public EncodedImageCallback { const CodecSpecificInfo*, const RTPFragmentationHeader*), (override)); - MOCK_METHOD(Result, - OnEncodedImage, - (const EncodedImage&, const CodecSpecificInfo*), - (override)); MOCK_METHOD(void, OnDroppedFrame, (DropReason reason), (override)); }; diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index ab946a26e0..4427d6c1f1 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; diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index c5b855349a..064dc8ffb5 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -73,16 +73,10 @@ class EncodedImageCallback { }; // 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) {} };