loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch DashManifestParser to use Ascii.equalsIgnoreCase

Browse Source 
String.equalsIgnoreCase depends on the device locale and is discouraged.

#minor-release

PiperOrigin-RevId: 368211677
This commit is contained in:
ibaker 2021-04-13 15:37:50 +01:00 committed by marcbaechinger
parent 3bd59f8cf0
commit 472b44f45a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View File

@ -39,6 +39,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.UriUtil; import com.google.android.exoplayer2.util.UriUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.util.XmlPullParserUtil; import com.google.android.exoplayer2.util.XmlPullParserUtil;
import com.google.common.base.Ascii;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -1393,7 +1394,7 @@ public class DashManifestParser extends DefaultHandler
protected int parseSelectionFlagsFromRoleDescriptors(List<Descriptor> roleDescriptors) { protected int parseSelectionFlagsFromRoleDescriptors(List<Descriptor> roleDescriptors) {
for (int i = 0; i < roleDescriptors.size(); i++) { for (int i = 0; i < roleDescriptors.size(); i++) {
Descriptor descriptor = roleDescriptors.get(i); Descriptor descriptor = roleDescriptors.get(i);
if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri) if (Ascii.equalsIgnoreCase("urn:mpeg:dash:role:2011", descriptor.schemeIdUri)
&& "main".equals(descriptor.value)) { && "main".equals(descriptor.value)) {
return C.SELECTION_FLAG_DEFAULT; return C.SELECTION_FLAG_DEFAULT;
} }
@ -1408,7 +1409,7 @@ public class DashManifestParser extends DefaultHandler
@C.RoleFlags int result = 0; @C.RoleFlags int result = 0;
for (int i = 0; i < roleDescriptors.size(); i++) { for (int i = 0; i < roleDescriptors.size(); i++) {
Descriptor descriptor = roleDescriptors.get(i); Descriptor descriptor = roleDescriptors.get(i);
if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri)) { if (Ascii.equalsIgnoreCase("urn:mpeg:dash:role:2011", descriptor.schemeIdUri)) {
result |= parseDashRoleSchemeValue(descriptor.value); result |= parseDashRoleSchemeValue(descriptor.value);
} }
} }
@ -1421,10 +1422,10 @@ public class DashManifestParser extends DefaultHandler
@C.RoleFlags int result = 0; @C.RoleFlags int result = 0;
for (int i = 0; i < accessibilityDescriptors.size(); i++) { for (int i = 0; i < accessibilityDescriptors.size(); i++) {
Descriptor descriptor = accessibilityDescriptors.get(i); Descriptor descriptor = accessibilityDescriptors.get(i);
if ("urn:mpeg:dash:role:2011".equalsIgnoreCase(descriptor.schemeIdUri)) { if (Ascii.equalsIgnoreCase("urn:mpeg:dash:role:2011", descriptor.schemeIdUri)) {
result |= parseDashRoleSchemeValue(descriptor.value); result |= parseDashRoleSchemeValue(descriptor.value);
} else if ("urn:tva:metadata:cs:AudioPurposeCS:2007" } else if (Ascii.equalsIgnoreCase(
.equalsIgnoreCase(descriptor.schemeIdUri)) { "urn:tva:metadata:cs:AudioPurposeCS:2007", descriptor.schemeIdUri)) {
result |= parseTvaAudioPurposeCsValue(descriptor.value); result |= parseTvaAudioPurposeCsValue(descriptor.value);
} }
} }
@ -1436,7 +1437,8 @@ public class DashManifestParser extends DefaultHandler
@C.RoleFlags int result = 0; @C.RoleFlags int result = 0;
for (int i = 0; i < accessibilityDescriptors.size(); i++) { for (int i = 0; i < accessibilityDescriptors.size(); i++) {
Descriptor descriptor = accessibilityDescriptors.get(i); Descriptor descriptor = accessibilityDescriptors.get(i);
if ("http://dashif.org/guidelines/trickmode".equalsIgnoreCase(descriptor.schemeIdUri)) { if (Ascii.equalsIgnoreCase(
"http://dashif.org/guidelines/trickmode", descriptor.schemeIdUri)) {
result |= C.ROLE_FLAG_TRICK_PLAY; result |= C.ROLE_FLAG_TRICK_PLAY;
} }
} }
@ -1801,8 +1803,8 @@ public class DashManifestParser extends DefaultHandler
List<Descriptor> supplementalProperties) { List<Descriptor> supplementalProperties) {
for (int i = 0; i < supplementalProperties.size(); i++) { for (int i = 0; i < supplementalProperties.size(); i++) {
Descriptor descriptor = supplementalProperties.get(i); Descriptor descriptor = supplementalProperties.get(i);
if ("http://dashif.org/guidelines/last-segment-number" if (Ascii.equalsIgnoreCase(
.equalsIgnoreCase(descriptor.schemeIdUri)) { "http://dashif.org/guidelines/last-segment-number", descriptor.schemeIdUri)) {
return Long.parseLong(descriptor.value); return Long.parseLong(descriptor.value);
} }
} }