expo-libvlc-player 6.1.3 → 6.1.4

package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt

@@ -419,14 +419,14 @@ class LibVlcPlayerView(
         var mediaInfo = MediaInfo()
 
         mediaPlayer?.let { player ->
-            val video = player.getCurrentVideoTrack()
+            val video = getVideoSize()
             val length = getMediaLength()
             val seekable = player.isSeekable()
 
             mediaInfo =
                 MediaInfo(
-                    width = video?.width ?: 0,
-                    height = video?.height ?: 0,
+                    width = video.width,
+                    height = video.height,
                     length = length.toDouble(),
                     seekable = seekable,
                 )
@@ -445,6 +445,12 @@ class LibVlcPlayerView(
         return Size(0, 0)
     }
 
+    val hasVideoSize: Boolean
+        get() {
+            val video = getVideoSize()
+            return video.width > 0 && video.height > 0
+        }
+
     val hasVideoOut: Boolean
         get() {
             val tracks = getMediaTracks()
@@ -453,10 +459,12 @@ class LibVlcPlayerView(
             return hasVideo && hasVideoSize && length > 0L
         }
 
-    val hasVideoSize: Boolean
+    val hasAudioOut: Boolean
         get() {
-            val video = getVideoSize()
-            return video.width > 0 && video.height > 0
+            val tracks = getMediaTracks()
+            val hasAudio = tracks.audio.any { track -> track.id != -1 }
+            val volume = mediaPlayer?.getVolume() ?: MediaPlayerConstants.MIN_PLAYER_VOLUME
+            return hasAudio && volume > MediaPlayerConstants.MIN_PLAYER_VOLUME
         }
 
     var source: String? = null
@@ -745,9 +753,7 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                 firstPlay = false
 
                                 retryUntil { isLastAttempt ->
-                                    val shouldSendEvent = hasVideoOut || isLastAttempt
-
-                                    if (shouldSendEvent) {
+                                    if (hasVideoOut || isLastAttempt) {
                                         onFirstPlay(getMediaInfo())
                                     }
 
@@ -755,9 +761,7 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                 }
 
                                 retryUntil { isLastAttempt ->
-                                    val shouldFitContent = hasVideoSize || isLastAttempt
-
-                                    if (shouldFitContent) {
+                                    if (hasVideoSize) {
                                         setContentFit(layout = playerLayout)
                                         setContentFit(layout = pictureLayout)
                                     }
@@ -785,15 +789,11 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                         MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
 
                         retryUntil { isLastAttempt ->
-                            val volume = player.getVolume()
-                            val hasVolume = volume > MediaPlayerConstants.MIN_PLAYER_VOLUME
-                            val shouldUpdateFocus = hasVolume || isLastAttempt
-
-                            if (shouldUpdateFocus) {
+                            if (hasAudioOut) {
                                 MediaPlayerManager.audioFocusManager.updateAudioFocus()
                             }
 
-                            return@retryUntil hasVolume
+                            return@retryUntil hasAudioOut
                         }
                     }
 

package/ios/LibVlcPlayerView.swift

@@ -291,7 +291,7 @@ class LibVlcPlayerView: ExpoView {
         var mediaInfo = MediaInfo()
 
         if let player = mediaPlayer {
-            let video = player.videoSize
+            let video = getVideoSize()
             let length = getMediaLength()
             let seekable = player.isSeekable
 
@@ -307,10 +307,15 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func getVideoSize() -> CGSize {
-        if let video = mediaPlayer?.videoSize { return video }
+        if let size = mediaPlayer?.videoSize { return size }
         return CGSize(width: 0, height: 0)
     }
 
+    var hasVideoSize: Bool {
+        let video = getVideoSize()
+        return video.width > 0 && video.height > 0
+    }
+
     var hasVideoOut: Bool {
         let tracks = getMediaTracks()
         let length = getMediaLength()
@@ -318,9 +323,11 @@ class LibVlcPlayerView: ExpoView {
         return hasVideo && hasVideoSize && length > 0
     }
 
-    var hasVideoSize: Bool {
-        let video = getVideoSize()
-        return video.width > 0 && video.height > 0
+    var hasAudioOut: Bool {
+        let tracks = getMediaTracks()
+        let hasAudio = tracks.audio.count > 0
+        let volume = mediaPlayer?.audio?.volume ?? Int32(MediaPlayerConstants.minPlayerVolume)
+        return hasAudio && volume > MediaPlayerConstants.minPlayerVolume
     }
 
     var source: String? {
@@ -569,21 +576,17 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                         retryUntil { [weak self] isLastAttempt in
                             guard let self else { return true }
 
-                            let shouldSendEvent = hasVideoOut || isLastAttempt
-
-                            if shouldSendEvent {
+                            if hasVideoOut || isLastAttempt {
                                 onFirstPlay(getMediaInfo())
                             }
 
                             return hasVideoOut
                         }
 
-                        retryUntil { [weak self] isLastAttempt in
+                        retryUntil { [weak self] _ in
                             guard let self else { return true }
 
-                            let shouldFitContent = hasVideoSize || isLastAttempt
-
-                            if shouldFitContent {
+                            if hasVideoSize {
                                 setContentFit(drawable: playerDrawable)
                                 setContentFit(drawable: pictureDrawable)
                             }
@@ -608,16 +611,14 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 pictureDrawable.updatePipState()
                 MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
 
-                retryUntil { isLastAttempt in
-                    let volume = player.audio?.volume ?? Int32(MediaPlayerConstants.minPlayerVolume)
-                    let hasVolume = volume > MediaPlayerConstants.minPlayerVolume
-                    let shouldUpdateSession = hasVolume || isLastAttempt
+                retryUntil { [weak self] _ in
+                    guard let self else { return true }
 
-                    if shouldUpdateSession {
+                    if hasAudioOut {
                         MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
                     }
 
-                    return hasVolume
+                    return hasAudioOut
                 }
             case .error:
                 onEncounteredError(["error": "Player encountered an error"])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "6.1.3",
+  "version": "6.1.4",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",