Remove trial WebRTC-SimulcastMaxLayers and make its behavior default
Also cleans up the unused parameters from GetSimulcastConfig. Bug: webrtc:8785, webrtc:8486 Change-Id: I1aea8f6c9e6590211ec5ee5cafc0ec2a2100d68f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144627 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Commit-Queue: Florent Castelli <orphis@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28496}
This commit is contained in:

committed by
Commit Bot

parent
ecae9cd1a7
commit
668ce0c7fa
@ -57,7 +57,6 @@ using VideoStatistics = VideoCodecTestStats::VideoStatistics;
|
||||
|
||||
namespace {
|
||||
const int kBaseKeyFrameInterval = 3000;
|
||||
const int kMaxBitrateBps = 5000 * 1000; // From kSimulcastFormats.
|
||||
const double kBitratePriority = 1.0;
|
||||
const int kMaxFramerateFps = 30;
|
||||
const int kMaxQp = 56;
|
||||
@ -65,8 +64,8 @@ const int kMaxQp = 56;
|
||||
void ConfigureSimulcast(VideoCodec* codec_settings) {
|
||||
const std::vector<webrtc::VideoStream> streams = cricket::GetSimulcastConfig(
|
||||
codec_settings->numberOfSimulcastStreams, codec_settings->width,
|
||||
codec_settings->height, kMaxBitrateBps, kBitratePriority, kMaxQp,
|
||||
kMaxFramerateFps, /* is_screenshare = */ false, true);
|
||||
codec_settings->height, kBitratePriority, kMaxQp,
|
||||
/* is_screenshare = */ false, true);
|
||||
|
||||
for (size_t i = 0; i < streams.size(); ++i) {
|
||||
SimulcastStream* ss = &codec_settings->simulcastStream[i];
|
||||
|
Reference in New Issue
Block a user