Delete obsolete tl_factory member and all mention thereof.
Bug: webrtc:9012
Change-Id: Ib67d139114aa03b9362cd05d12be5673a02c3e08
Reviewed-on: https://webrtc-review.googlesource.com/67160
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22792}diff --git a/common_types.cc b/common_types.cc
index a9e60ce..641c2c7 100644
--- a/common_types.cc
+++ b/common_types.cc
@@ -22,8 +22,6 @@
namespace webrtc {
bool VideoCodecVP8::operator==(const VideoCodecVP8& other) const {
- // Doesn't compare the tl_factory pointers, which are constructed
- // based on other members.
return (complexity == other.complexity &&
resilience == other.resilience &&
numberOfTemporalLayers == other.numberOfTemporalLayers &&
diff --git a/common_types.h b/common_types.h
index 3f63eb5..6834c0c 100644
--- a/common_types.h
+++ b/common_types.h
@@ -419,7 +419,6 @@
// within a frame.
};
-class TemporalLayersFactory;
// VP8 specific
struct VideoCodecVP8 {
bool operator==(const VideoCodecVP8& other) const;
@@ -433,7 +432,6 @@
bool automaticResizeOn;
bool frameDroppingOn;
int keyFrameInterval;
- TemporalLayersFactory* tl_factory;
};
// VP9 specific.
diff --git a/modules/video_coding/codecs/vp8/temporal_layers.h b/modules/video_coding/codecs/vp8/temporal_layers.h
index e36f257..a119b4f 100644
--- a/modules/video_coding/codecs/vp8/temporal_layers.h
+++ b/modules/video_coding/codecs/vp8/temporal_layers.h
@@ -129,15 +129,6 @@
virtual void FrameEncoded(unsigned int size, int qp) = 0;
};
-// TODO(webrtc:9012): Remove TemporalLayersFactory type and field once all
-// upstream usage is gone.
-class TemporalLayersFactory {
- public:
- TemporalLayersFactory() = default;
- virtual ~TemporalLayersFactory() = default;
-};
-
-
// Used only inside RTC_DCHECK(). It checks correctness of temporal layers
// dependencies and sync bits. The only method of this class is called after
// each UpdateLayersConfig() of a corresponding TemporalLayers class.
diff --git a/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h
index 24f3094..0748db0 100644
--- a/modules/video_coding/include/video_codec_initializer.h
+++ b/modules/video_coding/include/video_codec_initializer.h
@@ -38,9 +38,7 @@
VideoCodec* codec,
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator);
- // Create a bitrate allocator for the specified codec. |tl_factory| is
- // optional, if it is populated, ownership of that instance will be
- // transferred to the VideoBitrateAllocator instance.
+ // Create a bitrate allocator for the specified codec.
static std::unique_ptr<VideoBitrateAllocator> CreateBitrateAllocator(
const VideoCodec& codec);
