zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add EncodedImageCallback::OnEncodedImage without RTPFragmentationHeader"

Browse Source 
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}
This commit is contained in:
Marina Ciocea
2020-08-03 18:30:35 +00:00
committed by Commit Bot
parent fbbfc02698
commit 65e3044b40
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/test/mock_video_encoder.h
View File

@ -26,10 +26,6 @@ class MockEncodedImageCallback : public EncodedImageCallback {
const CodecSpecificInfo*, const CodecSpecificInfo*,
const RTPFragmentationHeader*), const RTPFragmentationHeader*),
(override)); (override));
MOCK_METHOD(Result,
OnEncodedImage,
(const EncodedImage&, const CodecSpecificInfo*),
(override));
MOCK_METHOD(void, OnDroppedFrame, (DropReason reason), (override)); MOCK_METHOD(void, OnDroppedFrame, (DropReason reason), (override));
}; };

13
api/video_codecs/video_encoder.cc
View File

@ -18,19 +18,6 @@
namespace webrtc { 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. // TODO(mflodman): Add default complexity for VP9 and VP9.
VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() { VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
VideoCodecVP8 vp8_settings; VideoCodecVP8 vp8_settings;

14
api/video_codecs/video_encoder.h
View File

@ -73,16 +73,10 @@ class EncodedImageCallback {
}; };
// Callback function which is called when an image has been encoded. // Callback function which is called when an image has been encoded.
// Deprecated, use OnEncodedImage below instead, see bugs.webrtc.org/6471 virtual Result OnEncodedImage(
virtual Result OnEncodedImage(const EncodedImage& encoded_image, const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info, const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation); const RTPFragmentationHeader* fragmentation) = 0;
// 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 void OnDroppedFrame(DropReason reason) {} virtual void OnDroppedFrame(DropReason reason) {}
}; };