From e9810a8adbeeae26b5f48c203bf98d51b4c595a5 Mon Sep 17 00:00:00 2001 From: Sergey Silkin Date: Sat, 6 Jul 2024 20:56:01 +0200 Subject: [PATCH] Use GetTemporalLayerSum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: b/337757868 Change-Id: Ieff4c22425bab06c12419d64db7a2eef69cc54d6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355962 Auto-Submit: Sergey Silkin Commit-Queue: Erik Språng Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#42630} --- modules/video_coding/codecs/av1/libaom_av1_encoder.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc index 258d3d3b88..db9238477d 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc @@ -818,16 +818,12 @@ void LibaomAv1Encoder::SetRates(const RateControlParameters& parameters) { if (SvcEnabled()) { for (int sid = 0; sid < svc_params_->number_spatial_layers; ++sid) { // libaom bitrate for spatial id S and temporal id T means bitrate - // of frames with spatial_id=S and temporal_id<=T - // while `parameters.bitrate` provdies bitrate of frames with - // spatial_id=S and temporal_id=T - int accumulated_bitrate_bps = 0; + // of frames with spatial_id=S and temporal_id<=T. for (int tid = 0; tid < svc_params_->number_temporal_layers; ++tid) { int layer_index = sid * svc_params_->number_temporal_layers + tid; - accumulated_bitrate_bps += parameters.bitrate.GetBitrate(sid, tid); // `svc_params_->layer_target_bitrate` expects bitrate in kbps. svc_params_->layer_target_bitrate[layer_index] = - accumulated_bitrate_bps / 1000; + parameters.bitrate.GetTemporalLayerSum(sid, tid) / 1000; } } SetEncoderControlParameters(AV1E_SET_SVC_PARAMS, &*svc_params_);