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

Strip trailing newline from WebVTT subtitles.

Browse Source
This commit is contained in:
ojw28 2014-10-01 21:26:12 +01:00
parent 9fc963acc6
commit ea1ab674a4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitle.java
View File

@ -79,15 +79,21 @@ public class WebvttSubtitle implements Subtitle {
@Override
public String getText(long timeUs) {
StringBuilder subtitleStringBuilder = new StringBuilder();
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < cueTimesUs.length; i += 2) {
if ((cueTimesUs[i] <= timeUs) && (timeUs < cueTimesUs[i + 1])) {
subtitleStringBuilder.append(cueText[i / 2]);
stringBuilder.append(cueText[i / 2]);
}
}
return (subtitleStringBuilder.length() > 0) ? subtitleStringBuilder.toString() : null;
int stringLength = stringBuilder.length();
if (stringLength > 0 && stringBuilder.charAt(stringLength - 1) == '\n') {
// Adjust the length to remove the trailing newline character.
stringLength -= 1;
}
return stringLength == 0 ? null : stringBuilder.substring(0, stringLength);
}
}