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

PiperOrigin-RevId: 332814223

RELEASENOTES.md

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

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

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