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

formatting

Browse Source
This commit is contained in:
Abel Jimenez 2021-03-03 02:51:26 -08:00
parent ec69977a1c
commit 8ac74a009e
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
View File

@ -324,22 +324,20 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
if (style.bold && style.italic) { if (style.bold && style.italic) {
spannableText.setSpan( spannableText.setSpan(
new StyleSpan(Typeface.BOLD_ITALIC), new StyleSpan(Typeface.BOLD_ITALIC),
0, /* start= */0,
spannableText.length(), /* end= */ spannableText.length(),
SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} } else if (style.bold) {
else if(style.bold){
spannableText.setSpan( spannableText.setSpan(
new StyleSpan(Typeface.BOLD), new StyleSpan(Typeface.BOLD),
0, /* start= */0,
spannableText.length(), /* end= */ spannableText.length(),
SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} } else if (style.italic) {
else if(style.italic){
spannableText.setSpan( spannableText.setSpan(
new StyleSpan(Typeface.ITALIC), new StyleSpan(Typeface.ITALIC),
0, /* start= */0,
spannableText.length(), /* end= */ spannableText.length(),
SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
} }

10
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
View File

@ -218,10 +218,9 @@ import java.util.regex.Pattern;
private static boolean parseBold(String bold) { private static boolean parseBold(String bold) {
try { try {
int boldFlag = Integer.parseInt(bold); int boldFlag = Integer.parseInt(bold);
if(boldFlag == 1 || boldFlag == -1){ if (boldFlag == 1 || boldFlag == -1) {
return true; return true;
} } else {
else{
return false; return false;
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -233,10 +232,9 @@ import java.util.regex.Pattern;
private static boolean parseItalic(String italic) { private static boolean parseItalic(String italic) {
try { try {
int italicFlag = Integer.parseInt(italic); int italicFlag = Integer.parseInt(italic);
if(italicFlag == 1 || italicFlag == -1){ if (italicFlag == 1 || italicFlag == -1) {
return true; return true;
} } else {
else{
return false; return false;
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {

2
library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
View File

@ -338,7 +338,7 @@ public final class SsaDecoderTest {
} }
@Test @Test
public void decodeBoldItalic() throws IOException{ public void decodeBoldItalic() throws IOException {
SsaDecoder decoder = new SsaDecoder(); SsaDecoder decoder = new SsaDecoder();
byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), STYLE_BOLD_ITALIC); byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), STYLE_BOLD_ITALIC);
Subtitle subtitle = decoder.decode(bytes, bytes.length, false); Subtitle subtitle = decoder.decode(bytes, bytes.length, false);