From 347a3276a6d7f29dddc16b3e1c8742473a8e8c8d Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 26 Oct 2020 11:40:26 +0100 Subject: [PATCH] Make ScalableVideoController::OnRatesUpdated pure virtual Bug: None Change-Id: I3684359ef253b3e674eadbd1a6791cf627c296a8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190283 Reviewed-by: Philip Eliasson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#32496} --- modules/video_coding/svc/scalable_video_controller.h | 4 +--- .../video_coding/svc/scalable_video_controller_no_layering.h | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_coding/svc/scalable_video_controller.h b/modules/video_coding/svc/scalable_video_controller.h index 578346e00c..d2d8486863 100644 --- a/modules/video_coding/svc/scalable_video_controller.h +++ b/modules/video_coding/svc/scalable_video_controller.h @@ -84,9 +84,7 @@ class ScalableVideoController { // Notifies Controller with updated bitrates per layer. In particular notifies // when certain layers should be disabled. // Controller shouldn't produce LayerFrameConfig for disabled layers. - // TODO(bugs.webrtc.org/11404): Make pure virtual when implemented by all - // structures. - virtual void OnRatesUpdated(const VideoBitrateAllocation& bitrates) {} + virtual void OnRatesUpdated(const VideoBitrateAllocation& bitrates) = 0; // When `restart` is true, first `LayerFrameConfig` should have `is_keyframe` // set to true. diff --git a/modules/video_coding/svc/scalable_video_controller_no_layering.h b/modules/video_coding/svc/scalable_video_controller_no_layering.h index 576761d044..e253ffe841 100644 --- a/modules/video_coding/svc/scalable_video_controller_no_layering.h +++ b/modules/video_coding/svc/scalable_video_controller_no_layering.h @@ -13,6 +13,7 @@ #include #include "api/transport/rtp/dependency_descriptor.h" +#include "api/video/video_bitrate_allocation.h" #include "common_video/generic_frame_descriptor/generic_frame_info.h" #include "modules/video_coding/svc/scalable_video_controller.h" @@ -27,6 +28,7 @@ class ScalableVideoControllerNoLayering : public ScalableVideoController { std::vector NextFrameConfig(bool restart) override; GenericFrameInfo OnEncodeDone(const LayerFrameConfig& config) override; + void OnRatesUpdated(const VideoBitrateAllocation& bitrates) override {} private: bool start_ = true;