@pigeonmal/react-native-video 7.0.0-beta.11 → 7.0.0-beta.13

package/README.md

@@ -31,6 +31,8 @@ Features:
 - player.resetForReuse() stop playback and clear tracks
 - player.progressEventInterval change the progress event interval
 - bugfix: external subtitles in hls/dash
+- bugfix: add langs to external subs
+- bugfix: onloadstart
 - nullable video player source : new VideoPlayer(undefined);
 - TextTrack type replaced to PlayerTrack
 - removed onTrackChange event

package/android/src/main/java/com/twg/video/core/player/MediaItemUtils.kt

@@ -92,6 +92,7 @@ fun getSubtitlesConfiguration(
           .setSelectionFlags(0) //  C.SELECTION_FLAG_DEFAULT
           .setRoleFlags(C.ROLE_FLAG_SUBTITLE)
           .setLabel(subtitle.label)
+          .setLanguage(subtitle.language)
           .build()
         subtitlesConfiguration.add(subtitleConfig)
       } catch (e: Exception) {

package/android/src/main/java/com/twg/video/core/utils/TrackUtils.kt

@@ -5,14 +5,13 @@ import androidx.media3.common.C
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
-import com.margelo.nitro.video.HybridVideoPlayerSourceSpec
 import com.margelo.nitro.video.PlayerTrack
 import com.margelo.nitro.video.AllPlayerTracks
 import com.margelo.nitro.video.VideoPlayerTrack
 
 @UnstableApi
 object TrackUtils {
-    fun getAvailableTextTracks(player: ExoPlayer, source: HybridVideoPlayerSourceSpec): Array<PlayerTrack> {
+    fun getAvailableTextTracks(player: ExoPlayer): Array<PlayerTrack> {
         return Threading.runOnMainThreadSync {
             val tracks = mutableListOf<PlayerTrack>()
             val currentTracks = player.currentTracks
@@ -28,13 +27,9 @@ object TrackUtils {
                         val language = format.language
                         val isSelected = trackGroup.isTrackSelected(trackIndex)
 
-                        val isExternal = trackId.startsWith("external-") == true
-
-                        val finalTrackId = if (isExternal) "external-$globalTrackIndex" else trackId
-
                         tracks.add(
                             PlayerTrack(
-                                id = finalTrackId,
+                                id = trackId,
                                 label = label,
                                 language = language,
                                 selected = isSelected
@@ -75,12 +70,7 @@ object TrackUtils {
                         val currentTrackId = format.id ?: "track-$type-$globalTrackIndex"
                         //val label = format.label ?: "Unknown ${globalTrackIndex + 1}"
 
-                        val isExternal = currentTrackId.startsWith("external-") == true
-
-                        val finalTrackId =
-                            if (isExternal) "external-$globalTrackIndex" else currentTrackId
-
-                        if (finalTrackId == id) {
+                        if (currentTrackId == id) {
                             // Enable this specific track
                             trackSelector.setTrackTypeDisabled(type, false)
                             trackSelector.setOverrideForType(
@@ -170,12 +160,8 @@ object TrackUtils {
                             val label = format.label ?: "Unknown ${globalTrackIndex + 1}"
                             val language = format.language
 
-                            val isExternal = trackId.startsWith("external-") == true
-
-                            val finalTrackId = if (isExternal) "external-$globalTrackIndex" else trackId
-
                             return@runOnMainThreadSync PlayerTrack(
-                                id = finalTrackId,
+                                id = trackId,
                                 label = label,
                                 language = language,
                                 selected = true
@@ -211,8 +197,6 @@ object TrackUtils {
                             val format = trackGroup.getTrackFormat(trackIndex)
 
                             val rawId = format.id ?: "track-${C.TRACK_TYPE_AUDIO}-$globalAudioIndex"
-                            val isExternal = rawId.startsWith("external-")
-                            val finalId = if (isExternal) "external-$globalAudioIndex" else rawId
 
                             val label = format.label ?: "Unknown ${globalAudioIndex + 1}"
                             val language = format.language
@@ -220,7 +204,7 @@ object TrackUtils {
 
                             audioTracks.add(
                                 PlayerTrack(
-                                    id = finalId,
+                                    id = rawId,
                                     label = label,
                                     language = language,
                                     selected = isSelected
@@ -235,8 +219,6 @@ object TrackUtils {
                             val format = trackGroup.getTrackFormat(trackIndex)
 
                             val rawId = format.id ?: "track-${C.TRACK_TYPE_TEXT}-$globalTextIndex"
-                            val isExternal = rawId.startsWith("external-")
-                            val finalId = if (isExternal) "external-$globalTextIndex" else rawId
 
                             val label = format.label ?: "Unknown ${globalTextIndex + 1}"
                             val language = format.language
@@ -244,7 +226,7 @@ object TrackUtils {
 
                             textTracks.add(
                                 PlayerTrack(
-                                    id = finalId,
+                                    id = rawId,
                                     label = label,
                                     language = language,
                                     selected = isSelected
@@ -260,8 +242,6 @@ object TrackUtils {
                             val format = trackGroup.getTrackFormat(trackIndex)
 
                             val rawId = format.id ?: "track-${C.TRACK_TYPE_VIDEO}-$globalVideoIndex"
-                            val isExternal = rawId.startsWith("external-")
-                            val finalId = if (isExternal) "external-$globalVideoIndex" else rawId
 
                             val label = format.label ?: "Unknown ${globalVideoIndex + 1}"
                             val language = format.language
@@ -274,7 +254,7 @@ object TrackUtils {
                                 VideoPlayerTrack(
                                     width = width,
                                     height = height,
-                                    id = finalId,
+                                    id = rawId,
                                     label = label,
                                     language = language,
                                     selected = isSelected

package/android/src/main/java/com/twg/video/hybrids/videoplayer/HybridVideoPlayer.kt

@@ -44,7 +44,7 @@ import kotlin.math.max
 @UnstableApi
 @DoNotStrip
 class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
-  override var source: HybridVideoPlayerSourceSpec?
+  override var source: HybridVideoPlayerSourceSpec? = null
   override var eventEmitter = HybridVideoPlayerEventEmitter()
     set(value) {
       if (field != value) {
@@ -74,7 +74,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
 
   // Buffer Config
   private var bufferConfig: BufferConfig? = null
-    get() = source?.config.bufferConfig
+    get() = source?.config?.bufferConfig
 
   // Time updates
   private val progressHandler = Handler(Looper.getMainLooper())
@@ -261,18 +261,27 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
       .setRenderersFactory(renderersFactory!!)
       .build()
 
+    currentPlayerView?.get()?.player = player
+
     loadedWithSource = true
 
     player.addListener(playerListener)
     player.addAnalyticsListener(analyticsListener)
     
-    val startPosition = hybridSource.config.startPosition
+    setPlayerMediaSource(hybridSource)
+  }
+
+  fun setPlayerMediaSource(hybridSource: HybridVideoPlayerSource) {
+   val startPosition = hybridSource.config.startPosition
     if (startPosition != null && startPosition > 0L) {
       player.setMediaSource(hybridSource.mediaSource, startPosition)
     } else {
       player.setMediaSource(hybridSource.mediaSource)
     }
+  }
 
+  fun preparePlayer(hybridSource: HybridVideoPlayerSource) {
+    player.prepare()
     // Emit onLoadStart
     val sourceType = if (hybridSource.uri.startsWith("http")) SourceType.NETWORK else SourceType.LOCAL
     eventEmitter.onLoadStart(onLoadStartData(sourceType = sourceType, source = hybridSource))
@@ -282,9 +291,10 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
 
   override fun initialize(): Promise<Unit> {
     return Promise.async {
+      val hybridSource = source as? HybridVideoPlayerSource ?: throw PlayerError.InvalidSource
       return@async runOnMainThreadSync {
         initializePlayer()
-        player.prepare()
+        preparePlayer(hybridSource)
       }
     }
   }
@@ -295,7 +305,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
       runOnMainThread {
         if (source.config.initializeOnCreation == true) {
           initializePlayer()
-          player.prepare()
+          preparePlayer(source)
         }
       }
     }
@@ -343,22 +353,19 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
           initializePlayer()
         } else {
           renderersFactory?.setTextOffset((hybridSource.config.initialSubtitleDelay ?: 0L) * 1_000L)
-          val startPosition = hybridSource.config.startPosition
-          if (startPosition != null && startPosition > 0L) {
-            player.setMediaSource(hybridSource.mediaSource, startPosition)
-          } else {
-            player.setMediaSource(hybridSource.mediaSource)
-          }
+          setPlayerMediaSource(hybridSource)
         }
         
         // Prepare player
-        player.prepare()
+        preparePlayer(hybridSource)
       }
     }
   }
 
   override fun preload(): Promise<Unit> {
     return Promise.async {
+      val hybridSource = source as? HybridVideoPlayerSource ?: throw PlayerError.InvalidSource
+
       runOnMainThreadSync {
         if (!loadedWithSource) {
           initializePlayer()
@@ -368,7 +375,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
           return@runOnMainThreadSync
         }
 
-        player.prepare()
+        preparePlayer(hybridSource)
       }
     }
   }
@@ -492,9 +499,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
           eventEmitter.onBuffer(false)
 
           val allTracks = TrackUtils.getAllPlayerTracksInternal(player)
-          val selectedVideo: VideoPlayerTrack? =
-            allTracks.videos.firstOrNull { it.selected }
-              ?: player.videoFormat?.let { format ->
+          val selectedVideo: VideoPlayerTrack? = player.videoFormat?.let { format ->
                 VideoPlayerTrack(
                   width = format.width.toDouble(),
                   height = format.height.toDouble(),
@@ -504,7 +509,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
                   selected = true,
                   language = null
                 )
-              }
+              } ?: allTracks.videos.firstOrNull { it.selected }
           val width = selectedVideo?.width ?: 0.0
           val height = selectedVideo?.height ?: 0.0
 //          val rotationDegrees = selectedVideoTrackFormat?.rotationDegrees ?: generalVideoFormat?.rotationDegrees
@@ -636,7 +641,7 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
   // MARK: - Text Track Management
 
   override fun getAvailableTextTracks(): Array<PlayerTrack> {
-    return TrackUtils.getAvailableTextTracks(player, source)
+    return TrackUtils.getAvailableTextTracks(player)
   }
 
   override fun getAllPlayerTracks(): AllPlayerTracks {
@@ -653,6 +658,8 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
 
   override fun resetForReuse() {
     runOnMainThread {
+      stopProgressUpdates()
+      this.source = null
       if (player.playbackState != Player.STATE_IDLE) {
         player.stop()
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pigeonmal/react-native-video",
-  "version": "7.0.0-beta.11",
+  "version": "7.0.0-beta.13",
   "description": "<Video /> Component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",