admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated version of EncodedImageCallback::OnEncodedImage

Browse Source 
Bug: webrtc:6471
Change-Id: I173cd3b3b9f4badaf7c17574adf1d09a926a9b9b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/182380
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31982}
This commit is contained in:
Danil Chapovalov 2020-08-24 11:18:00 +02:00 committed by Commit Bot
parent f7cf133ad5
commit 70b2cf8b36
4 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
View File

@ -29,7 +29,6 @@
#include "api/video/video_rotation.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/include/module_common_types.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
@ -82,8 +81,7 @@ VideoEncoder::EncoderInfo GetEncoderInfoWithInternalSource(
class FakeEncodedImageCallback : public EncodedImageCallback {
public:
Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) override {
const CodecSpecificInfo* codec_specific_info) override {
++callback_count_;
return Result(Result::OK, callback_count_);
}
@ -123,8 +121,7 @@ class VideoEncoderSoftwareFallbackWrapperTestBase : public ::testing::Test {
last_video_frame_ = frame;
if (encode_complete_callback_ &&
encode_return_code_ == WEBRTC_VIDEO_CODEC_OK) {
encode_complete_callback_->OnEncodedImage(EncodedImage(), nullptr,
nullptr);
encode_complete_callback_->OnEncodedImage(EncodedImage(), nullptr);
}
return encode_return_code_;
}

13
api/video_codecs/video_encoder.cc
View File

@ -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;

14
api/video_codecs/video_encoder.h
View File

@ -30,7 +30,6 @@
namespace webrtc {
class RTPFragmentationHeader;
// TODO(pbos): Expose these through a public (root) header or change these APIs.
struct CodecSpecificInfo;
@ -73,16 +72,9 @@ class RTC_EXPORT 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) = 0;
virtual void OnDroppedFrame(DropReason reason) {}
};

6
sdk/objc/native/src/objc_video_encoder_factory.mm
View File

@ -17,7 +17,6 @@
#import "base/RTCVideoEncoderFactory.h"
#import "components/video_codec/RTCCodecSpecificInfoH264+Private.h"
#import "sdk/objc/api/peerconnection/RTCEncodedImage+Private.h"
#import "sdk/objc/api/peerconnection/RTCRtpFragmentationHeader+Private.h"
#import "sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.h"
#import "sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.h"
#import "sdk/objc/api/video_codec/RTCVideoCodecConstants.h"
@ -62,10 +61,7 @@ class ObjCVideoEncoder : public VideoEncoder {
[(RTC_OBJC_TYPE(RTCCodecSpecificInfoH264) *)info nativeCodecSpecificInfo];
}
std::unique_ptr<RTPFragmentationHeader> fragmentationHeader =
[header createNativeFragmentationHeader];
EncodedImageCallback::Result res =
callback->OnEncodedImage(encodedImage, &codecSpecificInfo, fragmentationHeader.get());
EncodedImageCallback::Result res = callback->OnEncodedImage(encodedImage, &codecSpecificInfo);
return res.error == EncodedImageCallback::Result::OK;
}];