Skip to content

SDK / exoplayer

Go to a project
Commit 6f89ddfe by ibaker Committed by Rohit Singh
Options

Rollback of https://github.com/androidx/media/commit/a358ccb046d84c44dc7d54ed39d7563074cd5535 

*** Original commit ***

Fix double initialisation of createIsoLanguageReplacementMap

In the absence of any lock `createIsoLanguageReplacementMap`
method was getting called twice due to race condition.
Used Suppliers.memoize() which is by default thread safe.

***

PiperOrigin-RevId: 524794650
parent f2cd34ad
Inline Side-by-side
Showing with 81 additions and 83 deletions
libraries/common/src/main/java/androidx/media3/common/util/Util.java
...@@ -85,9 +85,6 @@ import androidx.media3.common.Player; ...@@ -85,9 +85,6 @@ import androidx.media3.common.Player;
import androidx.media3.common.Player.Commands; import androidx.media3.common.Player.Commands;
import com.google.common.base.Ascii; import com.google.common.base.Ascii;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.AsyncFunction;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
...@@ -111,7 +108,6 @@ import java.util.GregorianCalendar; ...@@ -111,7 +108,6 @@ import java.util.GregorianCalendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.TimeZone; import java.util.TimeZone;
...@@ -184,8 +180,7 @@ public final class Util { ...@@ -184,8 +180,7 @@ public final class Util {
private static final String ISM_DASH_FORMAT_EXTENSION = "format=mpd-time-csf"; private static final String ISM_DASH_FORMAT_EXTENSION = "format=mpd-time-csf";
// Replacement map of ISO language codes used for normalization. // Replacement map of ISO language codes used for normalization.
private static final Supplier<ImmutableMap<String, String>> LANGUAGE_TAG_REPLACEMENT_MAP = @Nullable private static HashMap<String, String> languageTagReplacementMap;
Suppliers.memoize(Util::createIsoLanguageReplacementMap);
private Util() {} private Util() {}
...@@ -823,8 +818,10 @@ public final class Util { ...@@ -823,8 +818,10 @@ public final class Util {
} }
normalizedTag = Ascii.toLowerCase(normalizedTag); normalizedTag = Ascii.toLowerCase(normalizedTag);
String mainLanguage = splitAtFirst(normalizedTag, "-")[0]; String mainLanguage = splitAtFirst(normalizedTag, "-")[0];
if (languageTagReplacementMap == null) {
@Nullable String replacedLanguage = LANGUAGE_TAG_REPLACEMENT_MAP.get().get(mainLanguage); languageTagReplacementMap = createIsoLanguageReplacementMap();
}
@Nullable String replacedLanguage = languageTagReplacementMap.get(mainLanguage);
if (replacedLanguage != null) { if (replacedLanguage != null) {
normalizedTag = normalizedTag =
replacedLanguage + normalizedTag.substring(/* beginIndex= */ mainLanguage.length()); replacedLanguage + normalizedTag.substring(/* beginIndex= */ mainLanguage.length());
...@@ -2982,12 +2979,11 @@ public final class Util { ...@@ -2982,12 +2979,11 @@ public final class Util {
return locale.toLanguageTag(); return locale.toLanguageTag();
} }
private static ImmutableMap<String, String> createIsoLanguageReplacementMap() { private static HashMap<String, String> createIsoLanguageReplacementMap() {
String[] iso2Languages = Locale.getISOLanguages(); String[] iso2Languages = Locale.getISOLanguages();
HashMap<String, String> replacedLanguages = HashMap<String, String> replacedLanguages =
new HashMap<>( new HashMap<>(
/* initialCapacity= */ iso2Languages.length /* initialCapacity= */ iso2Languages.length + additionalIsoLanguageReplacements.length);
+ ADDITIONAL_ISO_LANGUAGE_REPLACEMENTS.size());
for (String iso2 : iso2Languages) { for (String iso2 : iso2Languages) {
try { try {
// This returns the ISO 639-2/T code for the language. // This returns the ISO 639-2/T code for the language.
...@@ -3000,9 +2996,11 @@ public final class Util { ...@@ -3000,9 +2996,11 @@ public final class Util {
} }
} }
// Add additional replacement mappings. // Add additional replacement mappings.
replacedLanguages.putAll(ADDITIONAL_ISO_LANGUAGE_REPLACEMENTS); for (int i = 0; i < additionalIsoLanguageReplacements.length; i += 2) {
replacedLanguages.put(
return ImmutableMap.copyOf(replacedLanguages); additionalIsoLanguageReplacements[i], additionalIsoLanguageReplacements[i + 1]);
}
return replacedLanguages;
} }
@RequiresApi(api = Build.VERSION_CODES.M) @RequiresApi(api = Build.VERSION_CODES.M)
...@@ -3024,84 +3022,84 @@ public final class Util { ...@@ -3024,84 +3022,84 @@ public final class Util {
} }
private static String maybeReplaceLegacyLanguageTags(String languageTag) { private static String maybeReplaceLegacyLanguageTags(String languageTag) {
for (Map.Entry<String, String> legacyTagToModernTag : ISO_LEGACY_TAG_REPLACEMENTS.entrySet()) { for (int i = 0; i < isoLegacyTagReplacements.length; i += 2) {
if (languageTag.startsWith(legacyTagToModernTag.getKey())) { if (languageTag.startsWith(isoLegacyTagReplacements[i])) {
return legacyTagToModernTag.getValue() return isoLegacyTagReplacements[i + 1]
+ languageTag.substring(/* beginIndex= */ legacyTagToModernTag.getKey().length()); + languageTag.substring(/* beginIndex= */ isoLegacyTagReplacements[i].length());
} }
} }
return languageTag; return languageTag;
} }
// Additional mapping from ISO3 to ISO2 language codes. // Additional mapping from ISO3 to ISO2 language codes.
private static final ImmutableMap<String, String> ADDITIONAL_ISO_LANGUAGE_REPLACEMENTS = private static final String[] additionalIsoLanguageReplacements =
new ImmutableMap.Builder<String, String>() new String[] {
// Bibliographical codes defined in ISO 639-2/B, replaced by terminological code defined // Bibliographical codes defined in ISO 639-2/B, replaced by terminological code defined in
// in ISO 639-2/T. See https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes. // ISO 639-2/T. See https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes.
.put("alb", "sq") "alb", "sq",
.put("arm", "hy") "arm", "hy",
.put("baq", "eu") "baq", "eu",
.put("bur", "my") "bur", "my",
.put("tib", "bo") "tib", "bo",
.put("chi", "zh") "chi", "zh",
.put("cze", "cs") "cze", "cs",
.put("dut", "nl") "dut", "nl",
.put("ger", "de") "ger", "de",
.put("gre", "el") "gre", "el",
.put("fre", "fr") "fre", "fr",
.put("geo", "ka") "geo", "ka",
.put("ice", "is") "ice", "is",
.put("mac", "mk") "mac", "mk",
.put("mao", "mi") "mao", "mi",
.put("may", "ms") "may", "ms",
.put("per", "fa") "per", "fa",
.put("rum", "ro") "rum", "ro",
.put("scc", "hbs-srp") "scc", "hbs-srp",
.put("slo", "sk") "slo", "sk",
.put("wel", "cy") "wel", "cy",
// Deprecated 2-letter codes, replaced by modern equivalent (including macrolanguage) // Deprecated 2-letter codes, replaced by modern equivalent (including macrolanguage)
// See https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, "ISO 639:1988" // See https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, "ISO 639:1988"
.put("id", "ms-ind") "id", "ms-ind",
.put("iw", "he") "iw", "he",
.put("heb", "he") "heb", "he",
.put("ji", "yi") "ji", "yi",
// Individual macrolanguage codes mapped back to full macrolanguage code. // Individual macrolanguage codes mapped back to full macrolanguage code.
// See https://en.wikipedia.org/wiki/ISO_639_macrolanguage // See https://en.wikipedia.org/wiki/ISO_639_macrolanguage
.put("arb", "ar-arb") "arb", "ar-arb",
.put("in", "ms-ind") "in", "ms-ind",
.put("ind", "ms-ind") "ind", "ms-ind",
.put("nb", "no-nob") "nb", "no-nob",
.put("nob", "no-nob") "nob", "no-nob",
.put("nn", "no-nno") "nn", "no-nno",
.put("nno", "no-nno") "nno", "no-nno",
.put("tw", "ak-twi") "tw", "ak-twi",
.put("twi", "ak-twi") "twi", "ak-twi",
.put("bs", "hbs-bos") "bs", "hbs-bos",
.put("bos", "hbs-bos") "bos", "hbs-bos",
.put("hr", "hbs-hrv") "hr", "hbs-hrv",
.put("hrv", "hbs-hrv") "hrv", "hbs-hrv",
.put("sr", "hbs-srp") "sr", "hbs-srp",
.put("srp", "hbs-srp") "srp", "hbs-srp",
.put("cmn", "zh-cmn") "cmn", "zh-cmn",
.put("hak", "zh-hak") "hak", "zh-hak",
.put("nan", "zh-nan") "nan", "zh-nan",
.put("hsn", "zh-hsn") "hsn", "zh-hsn"
.buildOrThrow(); };
// Legacy tags that have been replaced by modern equivalents (including macrolanguage) // Legacy tags that have been replaced by modern equivalents (including macrolanguage)
// See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry. // See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry.
private static final ImmutableMap<String, String> ISO_LEGACY_TAG_REPLACEMENTS = private static final String[] isoLegacyTagReplacements =
ImmutableMap.of( new String[] {
"i-lux", "lb", "i-lux", "lb",
"i-hak", "zh-hak", "i-hak", "zh-hak",
"i-navajo", "nv", "i-navajo", "nv",
"no-bok", "no-nob", "no-bok", "no-nob",
"no-nyn", "no-nno", "no-nyn", "no-nno",
"zh-guoyu", "zh-cmn", "zh-guoyu", "zh-cmn",
"zh-hakka", "zh-hak", "zh-hakka", "zh-hak",
"zh-min-nan", "zh-nan", "zh-min-nan", "zh-nan",
"zh-xiang", "zh-hsn"); "zh-xiang", "zh-hsn"
};
/** /**
* Allows the CRC-32 calculation to be done byte by byte instead of bit per bit in the order "most * Allows the CRC-32 calculation to be done byte by byte instead of bit per bit in the order "most
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment