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

#4306 - breaking after the first alignment tag is found

Browse Source
This commit is contained in:
Arnold Szabo 2018-10-01 22:45:15 +03:00
parent 876080ed1a
commit fc5eb12e79
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
View File

@ -80,7 +80,6 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
@Override @Override
protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) { protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) {
ArrayList<Cue> cues = new ArrayList<>(); ArrayList<Cue> cues = new ArrayList<>();
ArrayList<String> tags = new ArrayList<>();
LongArray cueTimesUs = new LongArray(); LongArray cueTimesUs = new LongArray();
ParsableByteArray subripData = new ParsableByteArray(bytes, length); ParsableByteArray subripData = new ParsableByteArray(bytes, length);
String currentLine; String currentLine;
@ -120,6 +119,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
} }
// Read and parse the text. // Read and parse the text.
ArrayList<String> tags = new ArrayList<>();
textBuilder.setLength(0); textBuilder.setLength(0);
while (!TextUtils.isEmpty(currentLine = subripData.readLine())) { while (!TextUtils.isEmpty(currentLine = subripData.readLine())) {
if (textBuilder.length() > 0) { if (textBuilder.length() > 0) {
@ -131,19 +131,15 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
Spanned text = Html.fromHtml(textBuilder.toString()); Spanned text = Html.fromHtml(textBuilder.toString());
Cue cue = null; Cue cue = null;
boolean alignTagFound = false;
// At end of this loop the clue must be created with the applied tags // At end of this loop the clue must be created with the applied tags
for (String tag : tags) { for (String tag : tags) {
// Check if the tag is an alignment tag // Check if the tag is an alignment tag
if (tag.matches(SUBRIP_ALIGNMENT_TAG)) { if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
// Based on the specs, in case of the alignment tags only the first appearance counts
if (alignTagFound) continue;
alignTagFound = true;
cue = buildCue(text, tag); cue = buildCue(text, tag);
// Based on the specs, in case of alignment tags only the first appearance counts, so break
break;
} }
} }