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}
71 lines
2.5 KiB
C++
71 lines
2.5 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 MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
|
|
#define MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
#include <vector>
|
|
|
|
#include "api/video/video_bitrate_allocation.h"
|
|
#include "api/video/video_bitrate_allocator.h"
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
#include "rtc_base/experiments/rate_control_settings.h"
|
|
#include "rtc_base/experiments/stable_target_rate_experiment.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class SimulcastRateAllocator : public VideoBitrateAllocator {
|
|
public:
|
|
explicit SimulcastRateAllocator(const VideoCodec& codec);
|
|
~SimulcastRateAllocator() override;
|
|
|
|
VideoBitrateAllocation Allocate(
|
|
VideoBitrateAllocationParameters parameters) override;
|
|
const VideoCodec& GetCodec() const;
|
|
|
|
static float GetTemporalRateAllocation(int num_layers,
|
|
int temporal_id,
|
|
bool base_heavy_tl3_alloc);
|
|
|
|
void SetLegacyConferenceMode(bool mode) override;
|
|
|
|
private:
|
|
void DistributeAllocationToSimulcastLayers(
|
|
DataRate total_bitrate,
|
|
DataRate stable_bitrate,
|
|
VideoBitrateAllocation* allocated_bitrates);
|
|
void DistributeAllocationToTemporalLayers(
|
|
VideoBitrateAllocation* allocated_bitrates) const;
|
|
std::vector<uint32_t> DefaultTemporalLayerAllocation(int bitrate_kbps,
|
|
int max_bitrate_kbps,
|
|
int simulcast_id) const;
|
|
std::vector<uint32_t> ScreenshareTemporalLayerAllocation(
|
|
int bitrate_kbps,
|
|
int max_bitrate_kbps,
|
|
int simulcast_id) const;
|
|
int NumTemporalStreams(size_t simulcast_id) const;
|
|
|
|
const VideoCodec codec_;
|
|
const StableTargetRateExperiment stable_rate_settings_;
|
|
const RateControlSettings rate_control_settings_;
|
|
std::vector<bool> stream_enabled_;
|
|
bool legacy_conference_mode_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(SimulcastRateAllocator);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
|