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

Merge pull request #7938 from bennettpeter:pullreq-ssa-subtitles

Browse Source 
PiperOrigin-RevId: 332814223
This commit is contained in:
Oliver Woodman 2020-09-21 22:57:58 +01:00
commit cf3e61ae6f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASENOTES.md
View File

@ -7,9 +7,8 @@
* Data sources: * Data sources:
* Add support for `android.resource` URI scheme in `RawResourceDataSource` * Add support for `android.resource` URI scheme in `RawResourceDataSource`
([#7866](https://github.com/google/ExoPlayer/issues/7866)). ([#7866](https://github.com/google/ExoPlayer/issues/7866)).
* Core library: * Text:
* Suppress Guava-related ProGuard/R8 warnings * Add support for `\h` SSA/ASS style override code (non-breaking space).
([#7904](https://github.com/google/ExoPlayer/issues/7904)).
### 2.12.0 (2020-09-11) ### ### 2.12.0 (2020-09-11) ###

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

@ -264,7 +264,8 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
String text = String text =
SsaStyle.Overrides.stripStyleOverrides(rawText) SsaStyle.Overrides.stripStyleOverrides(rawText)
.replaceAll("\\\\N", "\n") .replaceAll("\\\\N", "\n")
.replaceAll("\\\\n", "\n"); .replaceAll("\\\\n", "\n")
.replaceAll("\\\\h", "\u00A0");
Cue cue = createCue(text, style, styleOverrides, screenWidth, screenHeight); Cue cue = createCue(text, style, styleOverrides, screenWidth, screenHeight);
int startTimeIndex = addCuePlacerholderByTime(startTimeUs, cueTimesUs, cues); int startTimeIndex = addCuePlacerholderByTime(startTimeUs, cueTimesUs, cues);