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

Resolve merge conflict

Browse Source
This commit is contained in:
Oliver Woodman 2016-01-15 18:53:30 +00:00
commit b5c8595655
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlColorParser.java
View File

@ -89,12 +89,17 @@ import java.util.regex.Pattern;
Assertions.checkArgument(!TextUtils.isEmpty(colorExpression)); Assertions.checkArgument(!TextUtils.isEmpty(colorExpression));
colorExpression = colorExpression.replace(" ", ""); colorExpression = colorExpression.replace(" ", "");
if (colorExpression.charAt(0) == '#') { if (colorExpression.charAt(0) == '#') {
// Use a long to avoid rollovers on #ffXXXXXX // Use a long to avoid rollovers on #FFXXXXXX
long color = Long.parseLong(colorExpression.substring(1), 16); long color = Long.parseLong(colorExpression.substring(1), 16);
if (colorExpression.length() == 7) { if (colorExpression.length() == 7) {
// Set the alpha value // Set the alpha value
color |= 0x00000000FF000000; color |= 0x00000000FF000000;
} else if (colorExpression.length() != 9) { } else if (colorExpression.length() == 9) {
// We have #RRGGBBAA, but we need #AARRGGBB
int alpha = (int) color & 0x00000000000000FF;
color >>= 8;
color |= alpha << 24;
} else {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
return (int) color; return (int) color;