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}
61 lines
1.9 KiB
C++
61 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2016 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.
|
|
*/
|
|
|
|
#ifndef API_VIDEO_VIDEO_BITRATE_ALLOCATOR_H_
|
|
#define API_VIDEO_VIDEO_BITRATE_ALLOCATOR_H_
|
|
|
|
#include "api/units/data_rate.h"
|
|
#include "api/video/video_bitrate_allocation.h"
|
|
|
|
namespace webrtc {
|
|
|
|
struct VideoBitrateAllocationParameters {
|
|
VideoBitrateAllocationParameters(uint32_t total_bitrate_bps,
|
|
uint32_t framerate);
|
|
VideoBitrateAllocationParameters(DataRate total_bitrate, double framerate);
|
|
VideoBitrateAllocationParameters(DataRate total_bitrate,
|
|
DataRate stable_bitrate,
|
|
double framerate);
|
|
~VideoBitrateAllocationParameters();
|
|
|
|
DataRate total_bitrate;
|
|
DataRate stable_bitrate;
|
|
double framerate;
|
|
};
|
|
|
|
class VideoBitrateAllocator {
|
|
public:
|
|
VideoBitrateAllocator() {}
|
|
virtual ~VideoBitrateAllocator() {}
|
|
|
|
virtual VideoBitrateAllocation GetAllocation(uint32_t total_bitrate_bps,
|
|
uint32_t framerate);
|
|
|
|
virtual VideoBitrateAllocation Allocate(
|
|
VideoBitrateAllocationParameters parameters);
|
|
|
|
// Deprecated: Only used to work around issues with the legacy conference
|
|
// screenshare mode and shouldn't be needed by any subclasses.
|
|
virtual void SetLegacyConferenceMode(bool enabled);
|
|
};
|
|
|
|
class VideoBitrateAllocationObserver {
|
|
public:
|
|
VideoBitrateAllocationObserver() {}
|
|
virtual ~VideoBitrateAllocationObserver() {}
|
|
|
|
virtual void OnBitrateAllocationUpdated(
|
|
const VideoBitrateAllocation& allocation) = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_VIDEO_BITRATE_ALLOCATOR_H_
|