expo-video-subtitle 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -7,6 +7,29 @@ Changes inherited from the upstream base version are not repeated here — see t
 [upstream changelog](https://github.com/expo/expo/blob/main/packages/expo-video/CHANGELOG.md)
 for the history of everything that isn't subtitle related.
 
+## 0.7.1
+
+### Fixed
+
+- **Playing an `.ass` track crashed the player (Android).** `Regex(""""\\{([^}]*)}""")` in the sign
+  parser left the closing brace unescaped. `java.util.regex` accepts that; Android compiles regular
+  expressions with **ICU**, which does not, so the pattern threw `PatternSyntaxException` out of a
+  static initialiser on the extractor's loading thread and took playback down with it —
+  `ExceptionInInitializerError` on the first ASS subtitle the app opened.
+
+  The whole class of bug is invisible to this module's JVM tests, because the offending pattern
+  compiles there. `RegexPortabilityTest` now reads the sources instead and fails on any regex
+  literal with a brace that is neither escaped nor inside a character class.
+
+- **A subtitle this package cannot read no longer stops the video.** `StackingSsaParser.split` runs
+  on the extractor's loading thread, where a thrown exception is not a failed subtitle — it is a
+  dead player. It is now wrapped end to end, and a track that fails falls back to Media3's own ASS
+  handling, which draws the captions flat. Subtitle files are untrusted scraper output; plain
+  captions are the honest failure, a black screen is not.
+
+- **A multi-line sign follows its own alignment.** Every block was laid out centred, so the second
+  line of a left- or right-anchored placard pulled to the middle.
+
 ## 0.7.0
 
 ### Added

package/android/src/main/java/expo/modules/video/utils/AssSignOverlay.kt

@@ -149,9 +149,16 @@ internal class AssSignOverlay(context: Context) : View(context), Player.Listener
     // Wrapping is the script's job, not ours: a sign is placed by hand and its line breaks are
     // written into the text as \N. A width of "as wide as it wants" reproduces that.
     val textWidth = Layout.getDesiredWidth(sign.text, fillPaint).toInt() + 1
+    // A multi-line sign wraps its lines the way its own alignment says, not always centred: a
+    // left-anchored placard reads wrong with its second line pulled to the middle.
+    val blockAlignment = when ((sign.alignment - 1) % 3) {
+      0 -> Layout.Alignment.ALIGN_NORMAL
+      2 -> Layout.Alignment.ALIGN_OPPOSITE
+      else -> Layout.Alignment.ALIGN_CENTER
+    }
     val layout = StaticLayout.Builder
       .obtain(sign.text, 0, sign.text.length, fillPaint, textWidth)
-      .setAlignment(Layout.Alignment.ALIGN_CENTER)
+      .setAlignment(blockAlignment)
       .setIncludePad(false)
       .build()
 
@@ -199,7 +206,7 @@ internal class AssSignOverlay(context: Context) : View(context), Player.Listener
       // fill afterwards covers that half and leaves the outline the width the script asked for.
       StaticLayout.Builder
         .obtain(sign.text, 0, sign.text.length, strokePaint, textWidth)
-        .setAlignment(Layout.Alignment.ALIGN_CENTER)
+        .setAlignment(blockAlignment)
         .setIncludePad(false)
         .build()
     }

package/android/src/main/java/expo/modules/video/utils/AssSignParser.kt

@@ -37,8 +37,15 @@ internal object AssSignParser {
   private const val DEFAULT_PLAY_RES_X = 384f
   private const val DEFAULT_PLAY_RES_Y = 288f
 
-  /** Matches one override block, `{…}`. The contents are scanned separately. */
-  private val BRACES = Regex("""\{([^}]*)}""")
+  /**
+   * Matches one override block, `{…}`. The contents are scanned separately.
+   *
+   * Both braces are escaped. A bare closing brace is legal in `java.util.regex` and a syntax error
+   * in ICU, which is the engine Android actually uses — so the unescaped form compiles and passes
+   * on a JVM test run, then throws `PatternSyntaxException` from a static initialiser on device and
+   * takes the playback thread down with it.
+   */
+  private val BRACES = Regex("""\{([^}]*)\}""")
 
   /**
    * Splits a script into the part this package draws and the part Media3 draws.

package/android/src/main/java/expo/modules/video/utils/StackingSubtitleParser.kt

@@ -9,6 +9,7 @@ import androidx.media3.common.Format
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.text.Cue
 import androidx.media3.common.util.Consumer
+import androidx.media3.common.util.Log
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.extractor.text.CuesWithTiming
 import androidx.media3.extractor.text.DefaultSubtitleParserFactory
@@ -337,14 +338,29 @@ class StackingSsaParser(delegate: SubtitleParser) :
   StackingSubtitleParser(delegate, SsaCueNormalizer::normalize) {
 
   override fun split(data: ByteArray, offset: Int, length: Int): Split {
-    val content = runCatching { String(data, offset, length, Charsets.UTF_8) }.getOrNull()
-      ?: return Split(data, offset, length, emptyList())
-
-    val script = AssSignParser.parse(content)
-    if (script.signs.isEmpty()) return Split(data, offset, length, emptyList())
+    // Nothing in here is worth a crash, and the whole body is inside the guard rather than just the
+    // parse. This runs on the extractor's loading thread, where an exception does not fail the
+    // subtitle — it takes playback down with it, which is how a stray `}` in a regex turned into a
+    // dead player on an episode that had been playing fine.
+    //
+    // A subtitle file is untrusted input from a scraper. The honest failure for one this cannot
+    // read is captions drawn Media3's own way, flat, rather than no video at all.
+    return runCatching {
+      val script = AssSignParser.parse(String(data, offset, length, Charsets.UTF_8))
+      if (script.signs.isEmpty()) {
+        Split(data, offset, length, emptyList())
+      } else {
+        val dialogue = script.dialogueOnly.toByteArray(Charsets.UTF_8)
+        Split(dialogue, 0, dialogue.size, script.signs.map(::toEntry))
+      }
+    }.getOrElse { error ->
+      Log.w(TAG, "Sign rendering unavailable for this track; falling back to Media3", error)
+      Split(data, offset, length, emptyList())
+    }
+  }
 
-    val dialogue = script.dialogueOnly.toByteArray(Charsets.UTF_8)
-    return Split(dialogue, 0, dialogue.size, script.signs.map(::toEntry))
+  private companion object {
+    const val TAG = "StackingSsaParser"
   }
 
   private fun toEntry(sign: AssSign): PreparedCue {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-video-subtitle",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A cross-platform, performant video component for React Native and Expo with external subtitle sideloading and custom subtitle styling.",
   "keywords": [
     "expo",