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

Reland "Only enable conference mode simulcast allocations with flag enabled"

Browse Source 
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}
This commit is contained in:
Florent Castelli
2020-08-04 11:40:23 +02:00
committed by Commit Bot
parent c908c5575f
commit d3511010d9
18 changed files with 74 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/video/video_bitrate_allocator.cc
View File

@ -49,4 +49,6 @@ VideoBitrateAllocation VideoBitrateAllocator::Allocate(
return GetAllocation(parameters.total_bitrate.bps(), parameters.framerate);
}
void VideoBitrateAllocator::SetLegacyConferenceMode(bool enabled) {}
} // namespace webrtc

4
api/video/video_bitrate_allocator.h
View File

@ -40,6 +40,10 @@ class VideoBitrateAllocator {
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 {

1
api/video_codecs/video_codec.cc
View File

@ -83,6 +83,7 @@ VideoCodec::VideoCodec()
mode(VideoCodecMode::kRealtimeVideo),
expect_encode_from_texture(false),
timing_frame_thresholds({0, 0}),
legacy_conference_mode(false),
codec_specific_() {}
VideoCodecVP8* VideoCodec::VP8() {

3
api/video_codecs/video_codec.h
View File

@ -146,6 +146,9 @@ class RTC_EXPORT VideoCodec {
uint16_t outlier_ratio_percent;
} timing_frame_thresholds;
// Legacy Google conference mode flag for simulcast screenshare
bool legacy_conference_mode;
bool operator==(const VideoCodec& other) const = delete;
bool operator!=(const VideoCodec& other) const = delete;

3
api/video_codecs/video_encoder_config.cc
View File

@ -55,7 +55,8 @@ VideoEncoderConfig::VideoEncoderConfig()
min_transmit_bitrate_bps(0),
max_bitrate_bps(0),
bitrate_priority(1.0),
number_of_streams(0) {}
number_of_streams(0),
legacy_conference_mode(false) {}
VideoEncoderConfig::VideoEncoderConfig(VideoEncoderConfig&&) = default;

3
api/video_codecs/video_encoder_config.h
View File

@ -176,6 +176,9 @@ class VideoEncoderConfig {
// Max number of encoded VideoStreams to produce.
size_t number_of_streams;
// Legacy Google conference mode flag for simulcast screenshare
bool legacy_conference_mode;
private:
// Access to the copy constructor is private to force use of the Copy()
// method for those exceptional cases where we do use it.