From ed56cf44b0e2cf27a57b312372f56557899e8246 Mon Sep 17 00:00:00 2001 From: Elad Alon Date: Tue, 2 Jul 2019 11:20:23 +0200 Subject: [PATCH] Remove deprecated version of Vp8FrameBufferControllerFactory::Create MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:10769 Change-Id: I31de2d21d5325eb4b175815739c2477352842425 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144381 Commit-Queue: Elad Alon Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#28448} --- api/video_codecs/vp8_frame_buffer_controller.h | 16 +--------------- api/video_codecs/vp8_temporal_layers_factory.cc | 6 ------ api/video_codecs/vp8_temporal_layers_factory.h | 5 ----- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/api/video_codecs/vp8_frame_buffer_controller.h b/api/video_codecs/vp8_frame_buffer_controller.h index f3044138ca..d3f6bc426a 100644 --- a/api/video_codecs/vp8_frame_buffer_controller.h +++ b/api/video_codecs/vp8_frame_buffer_controller.h @@ -181,24 +181,10 @@ class Vp8FrameBufferControllerFactory { virtual std::unique_ptr Clone() const = 0; // Create a Vp8FrameBufferController instance. - // TODO(bugs.webrtc.org/10769): Update downstream projects, then remove - // version without |fec_controller_override| and make the other version - // pure-virtual. - // (In theory, if neither version is overridden, stack overflow would occur. - // In practice, all subclasses override at least one version, and following - // the update of downstream projects, only one pure-virtual version will - // remain.) - virtual std::unique_ptr Create( - const VideoCodec& codec, - const VideoEncoder::Settings& settings) { - return Create(codec, settings, nullptr); - } virtual std::unique_ptr Create( const VideoCodec& codec, const VideoEncoder::Settings& settings, - FecControllerOverride* fec_controller_override) { - return Create(codec, settings); - } + FecControllerOverride* fec_controller_override) = 0; }; } // namespace webrtc diff --git a/api/video_codecs/vp8_temporal_layers_factory.cc b/api/video_codecs/vp8_temporal_layers_factory.cc index f7d991c89f..0bd2c3d256 100644 --- a/api/video_codecs/vp8_temporal_layers_factory.cc +++ b/api/video_codecs/vp8_temporal_layers_factory.cc @@ -23,12 +23,6 @@ namespace webrtc { -std::unique_ptr Vp8TemporalLayersFactory::Create( - const VideoCodec& codec, - const VideoEncoder::Settings& settings) { - return Create(codec, settings, nullptr); -} - std::unique_ptr Vp8TemporalLayersFactory::Create( const VideoCodec& codec, const VideoEncoder::Settings& settings, diff --git a/api/video_codecs/vp8_temporal_layers_factory.h b/api/video_codecs/vp8_temporal_layers_factory.h index 082bfe28dc..7a146f1d4f 100644 --- a/api/video_codecs/vp8_temporal_layers_factory.h +++ b/api/video_codecs/vp8_temporal_layers_factory.h @@ -23,11 +23,6 @@ class Vp8TemporalLayersFactory : public Vp8FrameBufferControllerFactory { std::unique_ptr Clone() const override; - // TODO(bugs.webrtc.org/10769): Update downstream projects, then remove. - std::unique_ptr Create( - const VideoCodec& codec, - const VideoEncoder::Settings& settings) override; - std::unique_ptr Create( const VideoCodec& codec, const VideoEncoder::Settings& settings,