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

Move FakeCodec to separate target and behave like real encoder.

Browse Source 
Add FakeVp8Encoder, change FakeEncoder to use BitrateAllocator for simulcast.
Change call_test to use VP8 payload name for simulcast tests.

Bug: none
Change-Id: I5a34c52e66bbd6c05859729ed14ae87ac26b5969
Reviewed-on: https://webrtc-review.googlesource.com/91861
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24359}
This commit is contained in:
Ilya Nikolaevskiy
2018-08-21 12:49:46 +02:00
committed by Commit Bot
parent 4555c65388
commit 223eba5f72
16 changed files with 515 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@
#include <stdint.h>
#include <algorithm>
namespace webrtc {
DefaultVideoBitrateAllocator::DefaultVideoBitrateAllocator(
@ -27,14 +29,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;
}