diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index abdbf8c060..9856c08f1f 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -101,19 +101,6 @@ VideoEncoder::EncoderInfo::EncoderInfo(const EncoderInfo&) = default; VideoEncoder::EncoderInfo::~EncoderInfo() = default; -// Implementations of the interface must implement one or the other of these two -// methods. -int32_t VideoEncoder::Encode(const VideoFrame& frame, - const std::vector* frame_types) { - return Encode(frame, nullptr, frame_types); -} - -int32_t VideoEncoder::Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, - const std::vector* frame_types) { - return Encode(frame, frame_types); -} - int32_t VideoEncoder::SetRates(uint32_t bitrate, uint32_t framerate) { RTC_NOTREACHED() << "SetRate(uint32_t, uint32_t) is deprecated."; return -1; diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index 90cd8226b0..01082536b4 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -258,12 +258,7 @@ class RTC_EXPORT VideoEncoder { // WEBRTC_VIDEO_CODEC_MEMORY // WEBRTC_VIDEO_CODEC_ERROR virtual int32_t Encode(const VideoFrame& frame, - const std::vector* frame_types); - // TODO(bugs.webrtc.org/10379): Deprecated. Delete, and make above method pure - // virtual, as soon as downstream applications are updated. - virtual int32_t Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, - const std::vector* frame_types); + const std::vector* frame_types) = 0; // DEPRECATED! Instead use the one below: // void SetRateAllocation(const VideoBitrateAllocation&, DataRate, uint32) diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc index 9b719c215b..8030c4084d 100644 --- a/sdk/android/src/jni/android_media_encoder.cc +++ b/sdk/android/src/jni/android_media_encoder.cc @@ -101,7 +101,6 @@ class MediaCodecVideoEncoder : public VideoEncoder { int32_t /* number_of_cores */, size_t /* max_payload_size */) override; int32_t Encode(const VideoFrame& input_image, - const CodecSpecificInfo* /* codec_specific_info */, const std::vector* frame_types) override; int32_t RegisterEncodeCompleteCallback( EncodedImageCallback* callback) override; @@ -596,7 +595,6 @@ int32_t MediaCodecVideoEncoder::InitEncodeInternal(int width, int32_t MediaCodecVideoEncoder::Encode( const VideoFrame& frame, - const CodecSpecificInfo* /* codec_specific_info */, const std::vector* frame_types) { RTC_DCHECK_CALLED_SEQUENTIALLY(&encoder_queue_checker_); if (sw_fallback_required_) diff --git a/sdk/android/src/jni/video_encoder_wrapper.cc b/sdk/android/src/jni/video_encoder_wrapper.cc index 5ba140424c..960847fff0 100644 --- a/sdk/android/src/jni/video_encoder_wrapper.cc +++ b/sdk/android/src/jni/video_encoder_wrapper.cc @@ -120,7 +120,6 @@ int32_t VideoEncoderWrapper::Release() { int32_t VideoEncoderWrapper::Encode( const VideoFrame& frame, - const CodecSpecificInfo* /* codec_specific_info */, const std::vector* frame_types) { if (!initialized_) { // Most likely initializing the codec failed. diff --git a/sdk/android/src/jni/video_encoder_wrapper.h b/sdk/android/src/jni/video_encoder_wrapper.h index af369c6ee3..65940d66e2 100644 --- a/sdk/android/src/jni/video_encoder_wrapper.h +++ b/sdk/android/src/jni/video_encoder_wrapper.h @@ -42,7 +42,6 @@ class VideoEncoderWrapper : public VideoEncoder { int32_t Release() override; int32_t Encode(const VideoFrame& frame, - const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) override; int32_t SetRateAllocation(const VideoBitrateAllocation& allocation, diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm index 5c90978bb2..9f11bea686 100644 --- a/sdk/objc/native/src/objc_video_encoder_factory.mm +++ b/sdk/objc/native/src/objc_video_encoder_factory.mm @@ -74,7 +74,6 @@ class ObjCVideoEncoder : public VideoEncoder { int32_t Release() override { return [encoder_ releaseEncoder]; } int32_t Encode(const VideoFrame &frame, - const CodecSpecificInfo *codec_specific_info, const std::vector *frame_types) override { NSMutableArray *rtcFrameTypes = [NSMutableArray array]; for (size_t i = 0; i < frame_types->size(); ++i) {