d3511010d9
This is a reland of 32ca95145c4636374266f5b5d4d1ac43658bc758 Fix includes not enabling the screenshare conference behavior on non screenshare sources even if the flag is enabled. Original change's description: > Only enable conference mode simulcast allocations with flag enabled > > Non-conference mode simulcast screenshares were mistakenly using the > conference mode semantics in the simulcast rate allocator, which broke > spec compliant usage in some situation. > > This behavior should only be used when explicitly using the SDP entry > "a=x-google-flag:conference" in both offer and answer. > > Bug: webrtc:11310, chromium:1093819 > Change-Id: Ibcba75c88a8405d60467546b33977a782e04e469 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179081 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Commit-Queue: Florent Castelli <orphis@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31828} Bug: webrtc:11310 Bug: chromium:1093819 Change-Id: Ic933f93a5c4bad20583354fe821f8a1170e911cd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180802 Commit-Queue: Florent Castelli <orphis@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31847}
55 lines
1.9 KiB
C++
55 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/video/video_bitrate_allocator.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoBitrateAllocationParameters::VideoBitrateAllocationParameters(
|
|
uint32_t total_bitrate_bps,
|
|
uint32_t framerate)
|
|
: total_bitrate(DataRate::BitsPerSec(total_bitrate_bps)),
|
|
stable_bitrate(DataRate::BitsPerSec(total_bitrate_bps)),
|
|
framerate(static_cast<double>(framerate)) {}
|
|
|
|
VideoBitrateAllocationParameters::VideoBitrateAllocationParameters(
|
|
DataRate total_bitrate,
|
|
double framerate)
|
|
: total_bitrate(total_bitrate),
|
|
stable_bitrate(total_bitrate),
|
|
framerate(framerate) {}
|
|
|
|
VideoBitrateAllocationParameters::VideoBitrateAllocationParameters(
|
|
DataRate total_bitrate,
|
|
DataRate stable_bitrate,
|
|
double framerate)
|
|
: total_bitrate(total_bitrate),
|
|
stable_bitrate(stable_bitrate),
|
|
framerate(framerate) {}
|
|
|
|
VideoBitrateAllocationParameters::~VideoBitrateAllocationParameters() = default;
|
|
|
|
VideoBitrateAllocation VideoBitrateAllocator::GetAllocation(
|
|
uint32_t total_bitrate_bps,
|
|
uint32_t framerate) {
|
|
return Allocate({DataRate::BitsPerSec(total_bitrate_bps),
|
|
DataRate::BitsPerSec(total_bitrate_bps),
|
|
static_cast<double>(framerate)});
|
|
}
|
|
|
|
VideoBitrateAllocation VideoBitrateAllocator::Allocate(
|
|
VideoBitrateAllocationParameters parameters) {
|
|
return GetAllocation(parameters.total_bitrate.bps(), parameters.framerate);
|
|
}
|
|
|
|
void VideoBitrateAllocator::SetLegacyConferenceMode(bool enabled) {}
|
|
|
|
} // namespace webrtc
|