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}
This commit is contained in:
@ -22,8 +22,6 @@
|
|||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
||||||
bool VideoCodecVP8::operator==(const VideoCodecVP8& other) const {
|
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 &&
|
return (complexity == other.complexity &&
|
||||||
resilience == other.resilience &&
|
resilience == other.resilience &&
|
||||||
numberOfTemporalLayers == other.numberOfTemporalLayers &&
|
numberOfTemporalLayers == other.numberOfTemporalLayers &&
|
||||||
|
@ -419,7 +419,6 @@ enum VP8ResilienceMode {
|
|||||||
// within a frame.
|
// within a frame.
|
||||||
};
|
};
|
||||||
|
|
||||||
class TemporalLayersFactory;
|
|
||||||
// VP8 specific
|
// VP8 specific
|
||||||
struct VideoCodecVP8 {
|
struct VideoCodecVP8 {
|
||||||
bool operator==(const VideoCodecVP8& other) const;
|
bool operator==(const VideoCodecVP8& other) const;
|
||||||
@ -433,7 +432,6 @@ struct VideoCodecVP8 {
|
|||||||
bool automaticResizeOn;
|
bool automaticResizeOn;
|
||||||
bool frameDroppingOn;
|
bool frameDroppingOn;
|
||||||
int keyFrameInterval;
|
int keyFrameInterval;
|
||||||
TemporalLayersFactory* tl_factory;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// VP9 specific.
|
// VP9 specific.
|
||||||
|
@ -129,15 +129,6 @@ class TemporalLayers {
|
|||||||
virtual void FrameEncoded(unsigned int size, int qp) = 0;
|
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
|
// Used only inside RTC_DCHECK(). It checks correctness of temporal layers
|
||||||
// dependencies and sync bits. The only method of this class is called after
|
// dependencies and sync bits. The only method of this class is called after
|
||||||
// each UpdateLayersConfig() of a corresponding TemporalLayers class.
|
// each UpdateLayersConfig() of a corresponding TemporalLayers class.
|
||||||
|
@ -38,9 +38,7 @@ class VideoCodecInitializer {
|
|||||||
VideoCodec* codec,
|
VideoCodec* codec,
|
||||||
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator);
|
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator);
|
||||||
|
|
||||||
// Create a bitrate allocator for the specified codec. |tl_factory| is
|
// Create a bitrate allocator for the specified codec.
|
||||||
// optional, if it is populated, ownership of that instance will be
|
|
||||||
// transferred to the VideoBitrateAllocator instance.
|
|
||||||
static std::unique_ptr<VideoBitrateAllocator> CreateBitrateAllocator(
|
static std::unique_ptr<VideoBitrateAllocator> CreateBitrateAllocator(
|
||||||
const VideoCodec& codec);
|
const VideoCodec& codec);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user