@pigeonmal/react-native-video 7.0.0-beta.12 → 7.0.0-beta.15

package/README.md

@@ -4,7 +4,7 @@ Date: 19/12/2025
 (Only android)
 Install :
 
-1. npm install @pigeonmal/react-native-video@beta react-native-nitro-fetch
+1. npm install @pigeonmal/react-native-video@beta @pigeonmal/react-native-nitro-fetch
 2. Add this to android/app/settings.gradle
 
 ```
@@ -12,8 +12,6 @@ include ':media3-ffmpeg-decoder'
 project(':media3-ffmpeg-decoder').projectDir = file('../node_modules/@pigeonmal/react-native-video/android/media3-ffmpeg-decoder')
 ```
 
-3. create a patch for react-native-nitro-fetch like in the patches/react-native-nitro-fetch@x.patch
-
 ---
 
 Features:
@@ -31,6 +29,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/build.gradle

@@ -234,7 +234,7 @@ dependencies {
   implementation "androidx.media3:media3-session:$media3_version"
 
   api project(':media3-ffmpeg-decoder')
-  implementation project(':react-native-nitro-fetch')
+  implementation project(':pigeonmal_react-native-nitro-fetch')
 
   if (ExoplayerDependencies.useExoplayerDash) {
     implementation "androidx.media3:media3-exoplayer-dash:$media3_version"

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

@@ -60,7 +60,7 @@ fun buildHttpDataSourceFactory(context: Context, source: HybridVideoPlayerSource
 fun buildCronetHttpDataSourceFactory(source: HybridVideoPlayerSourceSpec): CronetDataSource.Factory {
   // Get Cronet engine and executor from NitroFetch
   // used before NitroFetch.ioExecutor , but cause blocking thread
-  val factory = CronetDataSource.Factory(NitroFetch.getEngine(), Executors.newSingleThreadExecutor())
+  val factory = CronetDataSource.Factory(NitroFetch.getEngine(), NitroFetch.ioExecutor)
     .setConnectionTimeoutMs(10_000)
     .setReadTimeoutMs(10_000)
     .setResetTimeoutOnRedirects(true)

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

@@ -27,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
@@ -74,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(
@@ -169,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
@@ -210,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
@@ -219,7 +204,7 @@ object TrackUtils {
 
                             audioTracks.add(
                                 PlayerTrack(
-                                    id = finalId,
+                                    id = rawId,
                                     label = label,
                                     language = language,
                                     selected = isSelected
@@ -234,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
@@ -243,7 +226,7 @@ object TrackUtils {
 
                             textTracks.add(
                                 PlayerTrack(
-                                    id = finalId,
+                                    id = rawId,
                                     label = label,
                                     language = language,
                                     selected = isSelected
@@ -259,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
@@ -273,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

@@ -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,21 +499,12 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
           eventEmitter.onBuffer(false)
 
           val allTracks = TrackUtils.getAllPlayerTracksInternal(player)
-          val selectedVideo: VideoPlayerTrack? =
-            allTracks.videos.firstOrNull { it.selected }
-              ?: player.videoFormat?.let { format ->
-                VideoPlayerTrack(
-                  width = format.width.toDouble(),
-                  height = format.height.toDouble(),
-                  // We don't care for the true information, we use only width and height
-                  id = "general", 
-                  label = "General",
-                  selected = true,
-                  language = null
-                )
-              }
-          val width = selectedVideo?.width ?: 0.0
-          val height = selectedVideo?.height ?: 0.0
+          val (width, height) = player.videoFormat?.let { format ->
+              format.width.toDouble() to format.height.toDouble()
+          } ?: allTracks.videos.firstOrNull { it.selected }?.let {
+              it.width to it.height
+          } ?: (0.0 to 0.0)
+
 //          val rotationDegrees = selectedVideoTrackFormat?.rotationDegrees ?: generalVideoFormat?.rotationDegrees
 
           eventEmitter.onLoad(
@@ -653,10 +651,14 @@ class HybridVideoPlayer() : HybridVideoPlayerSpec(), AutoCloseable {
 
   override fun resetForReuse() {
     runOnMainThread {
-      if (player.playbackState != Player.STATE_IDLE) {
-        player.stop()
+      if (this.source != null) {
+        stopProgressUpdates()
+        this.source = null
+        if (player.playbackState != Player.STATE_IDLE) {
+          player.stop()
+        }
+        player.clearMediaItems()
       }
-      player.clearMediaItems()
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pigeonmal/react-native-video",
-  "version": "7.0.0-beta.12",
+  "version": "7.0.0-beta.15",
   "description": "<Video /> Component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -94,7 +94,7 @@
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": ">=0.27.2",
-    "react-native-nitro-fetch": ">=0.1.6"
+    "@pigeonmal/react-native-nitro-fetch": ">=0.1.7"
   },
   "release-it": {
     "npm": {