From 7f6444de089c17471e5883ef2ac6a3d0675c0a54 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 16 Aug 2021 16:37:05 +0200 Subject: [PATCH] Delete deprecated version of VideoCodingModule::RegisterReceiveCodec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13045 Change-Id: I3b26ed0725008c424dee938d1341c4a241f9ab3f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228948 Reviewed-by: Åsa Persson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#34846} --- modules/video_coding/include/video_coding.h | 5 ----- modules/video_coding/video_coding_impl.cc | 15 --------------- 2 files changed, 20 deletions(-) diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index 981bc74a8d..77b3eac236 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -12,7 +12,6 @@ #define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ #include "api/video/video_frame.h" -#include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "modules/include/module.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" @@ -48,10 +47,6 @@ class VideoCodingModule : public Module { // virtual void RegisterReceiveCodec(uint8_t payload_type, const VideoDecoder::Settings& settings) = 0; - ABSL_DEPRECATED("Use RegisterReceiveCodec above") - virtual int32_t RegisterReceiveCodec(uint8_t payload_type, - const VideoCodec* receiveCodec, - int32_t numberOfCores) = 0; // Register an external decoder object. // diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index 95a5d6b398..0129aa1bf6 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -62,21 +62,6 @@ class VideoCodingModuleImpl : public VideoCodingModule { receiver_.RegisterReceiveCodec(payload_type, decoder_settings); } - int32_t RegisterReceiveCodec(uint8_t payload_type, - const VideoCodec* receive_codec, - int32_t number_of_cores) override { - VideoDecoder::Settings decoder_settings; - if (receive_codec != nullptr) { - decoder_settings.set_codec_type(receive_codec->codecType); - decoder_settings.set_max_render_resolution( - {receive_codec->width, receive_codec->height}); - decoder_settings.set_buffer_pool_size(receive_codec->buffer_pool_size); - } - decoder_settings.set_number_of_cores(number_of_cores); - receiver_.RegisterReceiveCodec(payload_type, decoder_settings); - return 0; - } - void RegisterExternalDecoder(VideoDecoder* externalDecoder, uint8_t payloadType) override { receiver_.RegisterExternalDecoder(externalDecoder, payloadType);