zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass FecControllerOverride to Vp8FrameBufferControllerFactory::Create

Browse Source 
Previously, FecControllerOverride was passed to
Vp8FrameBufferController::SetFecControllerOverride. Passing to
the factory is a more elegant way, since it's only used when
the controller is constructed.

TBR=kwiberg@webrtc.org

Bug: webrtc:10769
Change-Id: Iae599889e7ca9003e3200c2911239cbb763ee65a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144380
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28443}
This commit is contained in:
Elad Alon
2019-07-02 11:20:09 +02:00
committed by Commit Bot
parent 14be7993c6
commit 45befc5f1f
20 changed files with 118 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/video_codecs/vp8_frame_buffer_controller.h
View File

@ -106,13 +106,6 @@ class Vp8FrameBufferController {
// The limits are suggestion-only; the controller is allowed to exceed them.
virtual void SetQpLimits(size_t stream_index, int min_qp, int max_qp) = 0;
// Set a FecControllerOverride, through which the bandwidth allocation
// decisions made by FecController may be overridden.
// TODO(bugs.webrtc.org/10769): Update downstream projects, then make
// this pure-virtual.
virtual void SetFecControllerOverride(
FecControllerOverride* fec_controller_override) {}
// Number of streamed controlled by |this|.
virtual size_t StreamCount() const = 0;
@ -188,9 +181,24 @@ class Vp8FrameBufferControllerFactory {
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) = 0;
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);
}
};
} // namespace webrtc