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

Reland "Move FakeCodec to separate target and behave like real encoder."

Browse Source 
Reland after fixes for ramp-up-tests

original reviewed on: https://webrtc-review.googlesource.com/95182

TBR=mbonadei@webrtc.org,ilnik@webrtc.org,sprang@webrtc.org,srte@webrtc.org,perkj@webrtc.org,titovartem@webrtc.org

Bug: none
Change-Id: I4f9af0c98a0341dd4fadd5184bb85d7511efbdc0
Reviewed-on: https://webrtc-review.googlesource.com/96120
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24450}
This commit is contained in:
Ilya Nikolaevskiy
2018-08-27 14:12:27 +02:00
committed by Commit Bot
parent bf2b620cc8
commit b0588e6368
17 changed files with 552 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/video_coding/utility/default_video_bitrate_allocator.cc
View File

@ -12,6 +12,8 @@
#include <stdint.h>
#include <algorithm>
namespace webrtc {
DefaultVideoBitrateAllocator::DefaultVideoBitrateAllocator(
@ -20,6 +22,8 @@ DefaultVideoBitrateAllocator::DefaultVideoBitrateAllocator(
DefaultVideoBitrateAllocator::~DefaultVideoBitrateAllocator() {}
// TODO(http://crbug.com/webrtc/9671): Do not split bitrate between simulcast
// streams, but allocate everything to the first stream.
VideoBitrateAllocation DefaultVideoBitrateAllocator::GetAllocation(
uint32_t total_bitrate_bps,
uint32_t framerate) {
@ -27,14 +31,23 @@ VideoBitrateAllocation DefaultVideoBitrateAllocator::GetAllocation(
if (total_bitrate_bps == 0 || !codec_.active)
return allocation;
if (total_bitrate_bps < codec_.minBitrate * 1000) {
allocation.SetBitrate(0, 0, codec_.minBitrate * 1000);
} else if (codec_.maxBitrate > 0 &&
total_bitrate_bps > codec_.maxBitrate * 1000) {
allocation.SetBitrate(0, 0, codec_.maxBitrate * 1000);
} else {
allocation.SetBitrate(0, 0, total_bitrate_bps);
uint32_t allocated_bitrate_bps = total_bitrate_bps;
allocated_bitrate_bps =
std::max(allocated_bitrate_bps, codec_.minBitrate * 1000);
if (codec_.maxBitrate > 0) {
allocated_bitrate_bps =
std::min(allocated_bitrate_bps, codec_.maxBitrate * 1000);
}
size_t num_simulcast_streams =
std::max<size_t>(1, codec_.numberOfSimulcastStreams);
// The bitrate is split between all the streams in proportion of powers of 2
// e.g. 1:2, 1:2:4, etc.
for (size_t i = 0; i < num_simulcast_streams; i++) {
allocation.SetBitrate(
i, 0,
allocated_bitrate_bps * (1 << i) / ((1 << num_simulcast_streams) - 1));
}
return allocation;
}