Remove deprecated version of Vp8FrameBufferControllerFactory::Create
Bug: webrtc:10769
Change-Id: I31de2d21d5325eb4b175815739c2477352842425
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144381
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28448}
diff --git a/api/video_codecs/vp8_frame_buffer_controller.h b/api/video_codecs/vp8_frame_buffer_controller.h
index f304413..d3f6bc4 100644
--- a/api/video_codecs/vp8_frame_buffer_controller.h
+++ b/api/video_codecs/vp8_frame_buffer_controller.h
@@ -181,24 +181,10 @@
virtual std::unique_ptr<Vp8FrameBufferControllerFactory> 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<Vp8FrameBufferController> Create(
- const VideoCodec& codec,
- const VideoEncoder::Settings& settings) {
- return Create(codec, settings, nullptr);
- }
virtual std::unique_ptr<Vp8FrameBufferController> 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 f7d991c..0bd2c3d 100644
--- a/api/video_codecs/vp8_temporal_layers_factory.cc
+++ b/api/video_codecs/vp8_temporal_layers_factory.cc
@@ -25,12 +25,6 @@
std::unique_ptr<Vp8FrameBufferController> Vp8TemporalLayersFactory::Create(
const VideoCodec& codec,
- const VideoEncoder::Settings& settings) {
- return Create(codec, settings, nullptr);
-}
-
-std::unique_ptr<Vp8FrameBufferController> Vp8TemporalLayersFactory::Create(
- const VideoCodec& codec,
const VideoEncoder::Settings& settings,
FecControllerOverride* fec_controller_override) {
std::vector<std::unique_ptr<Vp8FrameBufferController>> controllers;
diff --git a/api/video_codecs/vp8_temporal_layers_factory.h b/api/video_codecs/vp8_temporal_layers_factory.h
index 082bfe2..7a146f1 100644
--- a/api/video_codecs/vp8_temporal_layers_factory.h
+++ b/api/video_codecs/vp8_temporal_layers_factory.h
@@ -23,11 +23,6 @@
std::unique_ptr<Vp8FrameBufferControllerFactory> Clone() const override;
- // TODO(bugs.webrtc.org/10769): Update downstream projects, then remove.
- std::unique_ptr<Vp8FrameBufferController> Create(
- const VideoCodec& codec,
- const VideoEncoder::Settings& settings) override;
-
std::unique_ptr<Vp8FrameBufferController> Create(
const VideoCodec& codec,
const VideoEncoder::Settings& settings,