expo-video-subtitle 0.7.2 → 0.7.3

package/CHANGELOG.md

@@ -7,6 +7,25 @@ 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.3
+
+Hardening only. Nothing here changes what 0.7.2 draws when 0.7.2 works.
+
+### Changed
+
+- **The sign store falls back to the only script it holds when the track id does not match.** The
+  parser reads `Format.id` from the `Format` its factory was handed; the overlay reads it from the
+  selected text track. Those should be the same value, but if they ever are not, the failure is
+  silent and total — signs parse correctly and never appear, which is precisely how the previous two
+  delivery attempts failed. With one track loaded there is nothing to be ambiguous about. With
+  several it still declines, because a wrong guess would draw one language's typesetting over
+  another's.
+
+- **The overlay logs what it resolved.** Every way this subsystem has failed so far has been quiet:
+  a dropped span, a rejected timestamp, an id that did not match. One line under the `AssSignOverlay`
+  tag now says which text track was selected and how many signs were found for it, so the next
+  failure is one `logcat` away instead of a bisect.
+
 ## 0.7.2
 
 ### Fixed

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

@@ -18,6 +18,7 @@ import androidx.annotation.OptIn
 import androidx.media3.common.C
 import androidx.media3.common.Player
 import androidx.media3.common.Tracks
+import androidx.media3.common.util.Log
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
@@ -101,8 +102,12 @@ internal class AssSignOverlay(context: Context) : View(context), Player.Listener
   }
 
   private fun resolveScript() {
-    val next = AssSignStore.get(selectedTextTrackId())
+    val trackId = selectedTextTrackId()
+    val next = AssSignStore.get(trackId)
     if (next === script) return
+    // Logged because every way this has failed so far has been silent. If signs go missing again,
+    // this line says whether the parser filed them and whether the overlay found them.
+    Log.d(TAG, "text track $trackId -> ${next?.signs?.size ?: "no"} sign(s)")
     script = next
     layouts = HashMap()
     setActive(emptyList())
@@ -318,6 +323,7 @@ internal class AssSignOverlay(context: Context) : View(context), Player.Listener
   }
 
   companion object {
+    private const val TAG = "AssSignOverlay"
     private const val OPAQUE = 0xFF000000.toInt()
 
     /** Removes the overlay from [playerView], dropping its listener registration with it. */

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

@@ -47,9 +47,21 @@ internal object AssSignStore {
     scripts[trackId] = script
   }
 
-  /** Called from the main thread, once per track change. */
+  /**
+   * Called from the main thread, once per track change.
+   *
+   * Falls back to the only script on hand when the id does not match. The two ends read `Format.id`
+   * from different places — the parser from the `Format` its factory was handed, the overlay from
+   * the selected track — and if those ever disagree the failure is silent and total: signs parse
+   * perfectly and never appear, which is exactly how the previous delivery route failed. With one
+   * track loaded there is no ambiguity to protect against, so the safe answer is the obvious one.
+   * With several, a wrong guess would draw one language's typesetting over another's, so it declines.
+   */
   @Synchronized
-  fun get(trackId: String?): AssScript? = trackId?.let { scripts[it] }
+  fun get(trackId: String?): AssScript? {
+    scripts[trackId]?.let { return it }
+    return scripts.values.singleOrNull()
+  }
 
   @Synchronized
   fun clear() {

package/package.json

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