loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5760 from matamegger:feature/hex_format_tags_in_url_template

Browse Source 
PiperOrigin-RevId: 246733842
This commit is contained in:
Oliver Woodman 2019-05-05 19:42:42 +01:00
commit 2a0ead1b29
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
View File

@ -139,7 +139,10 @@ public final class UrlTemplate {
String formatTag = DEFAULT_FORMAT_TAG; String formatTag = DEFAULT_FORMAT_TAG;
if (formatTagIndex != -1) { if (formatTagIndex != -1) {
formatTag = identifier.substring(formatTagIndex); formatTag = identifier.substring(formatTagIndex);
if (!formatTag.endsWith("d")) { // Allowed conversions are decimal integer (which is the only conversion allowed by the
// DASH specification) and hexadecimal integer (due to existing content that uses it).
// Else we assume that the conversion is missing, and that it should be decimal integer.
if (!formatTag.endsWith("d") && !formatTag.endsWith("x")) {
formatTag += "d"; formatTag += "d";
} }
identifier = identifier.substring(0, formatTagIndex); identifier = identifier.substring(0, formatTagIndex);