diff --git a/modules/video_coding/utility/simulcast_rate_allocator.cc b/modules/video_coding/utility/simulcast_rate_allocator.cc index 112424103e..5929572099 100644 --- a/modules/video_coding/utility/simulcast_rate_allocator.cc +++ b/modules/video_coding/utility/simulcast_rate_allocator.cc @@ -69,8 +69,7 @@ VideoBitrateAllocation SimulcastRateAllocator::Allocate( VideoBitrateAllocation allocated_bitrates_bps; DistributeAllocationToSimulcastLayers(parameters.total_bitrate.bps(), &allocated_bitrates_bps); - DistributeAllocationToTemporalLayers(std::ceil(parameters.framerate), - &allocated_bitrates_bps); + DistributeAllocationToTemporalLayers(&allocated_bitrates_bps); return allocated_bitrates_bps; } @@ -187,7 +186,6 @@ void SimulcastRateAllocator::DistributeAllocationToSimulcastLayers( } void SimulcastRateAllocator::DistributeAllocationToTemporalLayers( - uint32_t framerate, VideoBitrateAllocation* allocated_bitrates_bps) const { const int num_spatial_streams = std::max(1, static_cast(codec_.numberOfSimulcastStreams)); @@ -237,10 +235,10 @@ void SimulcastRateAllocator::DistributeAllocationToTemporalLayers( } else { if (conference_screenshare_mode) { tl_allocation = ScreenshareTemporalLayerAllocation( - target_bitrate_kbps, max_bitrate_kbps, framerate, simulcast_id); + target_bitrate_kbps, max_bitrate_kbps, simulcast_id); } else { tl_allocation = DefaultTemporalLayerAllocation( - target_bitrate_kbps, max_bitrate_kbps, framerate, simulcast_id); + target_bitrate_kbps, max_bitrate_kbps, simulcast_id); } } RTC_DCHECK_GT(tl_allocation.size(), 0); @@ -262,7 +260,6 @@ void SimulcastRateAllocator::DistributeAllocationToTemporalLayers( std::vector SimulcastRateAllocator::DefaultTemporalLayerAllocation( int bitrate_kbps, int max_bitrate_kbps, - int framerate, int simulcast_id) const { const size_t num_temporal_layers = NumTemporalStreams(simulcast_id); std::vector bitrates; @@ -294,11 +291,10 @@ std::vector SimulcastRateAllocator::ScreenshareTemporalLayerAllocation( int bitrate_kbps, int max_bitrate_kbps, - int framerate, int simulcast_id) const { if (simulcast_id > 0) { return DefaultTemporalLayerAllocation(bitrate_kbps, max_bitrate_kbps, - framerate, simulcast_id); + simulcast_id); } std::vector allocation; allocation.push_back(bitrate_kbps); diff --git a/modules/video_coding/utility/simulcast_rate_allocator.h b/modules/video_coding/utility/simulcast_rate_allocator.h index ea9211b93f..efbe5149b7 100644 --- a/modules/video_coding/utility/simulcast_rate_allocator.h +++ b/modules/video_coding/utility/simulcast_rate_allocator.h @@ -39,16 +39,13 @@ class SimulcastRateAllocator : public VideoBitrateAllocator { uint32_t total_bitrate_bps, VideoBitrateAllocation* allocated_bitrates_bps); void DistributeAllocationToTemporalLayers( - uint32_t framerate, VideoBitrateAllocation* allocated_bitrates_bps) const; std::vector DefaultTemporalLayerAllocation(int bitrate_kbps, int max_bitrate_kbps, - int framerate, int simulcast_id) const; std::vector ScreenshareTemporalLayerAllocation( int bitrate_kbps, int max_bitrate_kbps, - int framerate, int simulcast_id) const; int NumTemporalStreams(size_t simulcast_id) const;