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

Inclusive language in //sdk/android.

Browse Source 
Bug: webrtc:11680
Change-Id: I80f6b3c2ba21f49b0c05ebc27aecfc27a7be5836
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178392
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31590}
This commit is contained in:
Mirko Bonadei
2020-06-30 14:18:00 +02:00
committed by Commit Bot
parent 3cb0985983
commit f9e5248f5d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
View File

@ -18,13 +18,13 @@ import java.util.Arrays;
public class HardwareVideoDecoderFactory extends MediaCodecVideoDecoderFactory {
private final static Predicate<MediaCodecInfo> defaultAllowedPredicate =
new Predicate<MediaCodecInfo>() {
private String[] prefixBlacklist =
private String[] prefixBlocklist =
Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
@Override
public boolean test(MediaCodecInfo arg) {
final String name = arg.getName();
for (String prefix : prefixBlacklist) {
for (String prefix : prefixBlocklist) {
if (name.startsWith(prefix)) {
return false;
}

4
sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
View File

@ -21,14 +21,14 @@ public class PlatformSoftwareVideoDecoderFactory extends MediaCodecVideoDecoderF
*/
private static final Predicate<MediaCodecInfo> defaultAllowedPredicate =
new Predicate<MediaCodecInfo>() {
private String[] prefixWhitelist =
private String[] prefixAllowlist =
Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
@Override
public boolean test(MediaCodecInfo arg) {
final String name = arg.getName();
for (String prefix : prefixWhitelist) {
for (String prefix : prefixAllowlist) {
if (name.startsWith(prefix)) {
return true;
}

4
sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
View File

@ -219,14 +219,14 @@ class WebRtcAudioEffects {
// Returns true if an effect of the specified type is available. Functionally
// equivalent to (NoiseSuppressor|AutomaticGainControl|...).isAvailable(), but
// faster as it avoids the expensive OS call to enumerate effects.
private static boolean isEffectTypeAvailable(UUID effectType, UUID blackListedUuid) {
private static boolean isEffectTypeAvailable(UUID effectType, UUID blockListedUuid) {
Descriptor[] effects = getAvailableEffects();
if (effects == null) {
return false;
}
for (Descriptor d : effects) {
if (d.type.equals(effectType)) {
return !d.uuid.equals(blackListedUuid);
return !d.uuid.equals(blockListedUuid);
}
}
return false;

4
sdk/android/src/jni/audio_device/audio_device_module.cc
View File

@ -516,7 +516,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
}
// Returns true if the device both supports built in AEC and the device
// is not blacklisted.
// is not blocklisted.
// Currently, if OpenSL ES is used in both directions, this method will still
// report the correct value and it has the correct effect. As an example:
// a device supports built in AEC and this method returns true. Libjingle
@ -544,7 +544,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
}
// Returns true if the device both supports built in NS and the device
// is not blacklisted.
// is not blocklisted.
// TODO(henrika): add implementation for OpenSL ES based audio as well.
// In addition, see comments for BuiltInAECIsAvailable().
bool BuiltInNSIsAvailable() const override {