admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inclusive language in //media/engine.

Browse Source 
Bug: webrtc:11680
Change-Id: I4f21ecaf1e0cc35591ed00d776eb382b868fc076
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178391
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31589}
This commit is contained in:
Mirko Bonadei 2020-06-30 14:02:01 +02:00 committed by Commit Bot
parent 4b5792cc4a
commit 3cb0985983
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/engine/webrtc_video_engine.cc
View File

@ -245,7 +245,7 @@ static bool ValidateStreamParams(const StreamParams& sp) {
}
// Returns true if the given codec is disallowed from doing simulcast.
bool IsCodecBlacklistedForSimulcast(const std::string& codec_name) {
bool IsCodecDisabledForSimulcast(const std::string& codec_name) {
return !webrtc::field_trial::IsDisabled("WebRTC-H264Simulcast")
? absl::EqualsIgnoreCase(codec_name, kVp9CodecName)
: absl::EqualsIgnoreCase(codec_name, kH264CodecName) ||
@ -2321,11 +2321,11 @@ WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig(
}
// By default, the stream count for the codec configuration should match the
// number of negotiated ssrcs. But if the codec is blacklisted for simulcast
// number of negotiated ssrcs. But if the codec is disabled for simulcast
// or a screencast (and not in simulcast screenshare experiment), only
// configure a single stream.
encoder_config.number_of_streams = parameters_.config.rtp.ssrcs.size();
if (IsCodecBlacklistedForSimulcast(codec.name)) {
if (IsCodecDisabledForSimulcast(codec.name)) {
encoder_config.number_of_streams = 1;
}