expo-libvlc-player 5.0.0 → 5.0.1

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

@@ -42,6 +42,8 @@ private val DISPLAY_MANAGER: DisplayManager? = null
 private val ENABLE_SUBTITLES: Boolean = true
 private val USE_TEXTURE_VIEW: Boolean = true
 
+private val MAX_RETRY_COUNT: Int = 10
+
 class LibVlcPlayerView(
     context: Context,
     appContext: AppContext,
@@ -53,9 +55,8 @@ class LibVlcPlayerView(
     var media: Media? = null
     var vlcDialog: VLCDialog? = null
 
-    var mediaLength: Long? = null
     var firstPlay: Boolean = true
-    var firstTime: Boolean = true
+    private var retryCount: Int = 0
     private var shouldInit: Boolean = true
 
     val onBuffering by EventDispatcher<Unit>()
@@ -137,7 +138,6 @@ class LibVlcPlayerView(
         }
 
         firstPlay = true
-        firstTime = true
         shouldInit = false
     }
 
@@ -208,19 +208,20 @@ class LibVlcPlayerView(
 
     fun setContentFit() {
         post {
-            val textureView = getTextureView() ?: return@post
-
+            val view = getTextureView() ?: return@post
             val matrix = Matrix()
 
             mediaPlayer?.let { player ->
                 val video = player.getCurrentVideoTrack()
+                val width = video?.width ?: 0
+                val height = video?.height ?: 0
 
-                if (video != null) {
-                    val viewWidth = playerView.width.toFloat()
-                    val viewHeight = playerView.height.toFloat()
+                if (width > 0 && height > 0) {
+                    val viewWidth = view.width.toFloat()
+                    val viewHeight = view.height.toFloat()
 
-                    val videoWidth = video.width.toFloat()
-                    val videoHeight = video.height.toFloat()
+                    val videoWidth = width.toFloat()
+                    val videoHeight = height.toFloat()
 
                     val viewAspect = viewWidth / viewHeight
                     val videoAspect = videoWidth / videoHeight
@@ -260,7 +261,7 @@ class LibVlcPlayerView(
                 }
             }
 
-            textureView.setTransform(matrix)
+            view.setTransform(matrix)
         }
     }
 
@@ -270,8 +271,6 @@ class LibVlcPlayerView(
 
             addPlayerSlaves()
 
-            setContentFit()
-
             if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
                 player.setScale(scale)
             }
@@ -299,6 +298,32 @@ class LibVlcPlayerView(
         }
     }
 
+    fun setupFirstPlay() {
+        val tracks = getMediaTracks()
+        val media = getMediaInfo()
+        val length = getMediaLength()
+
+        val hasAudio = tracks.audio.any { track -> track.id != -1 }
+        val hasVideo = tracks.video.any { track -> track.id != -1 }
+
+        val hasAudioOnly = hasAudio && !hasVideo && length > 0L
+        val hasWidthAndHeight = media.width > 0 && media.height > 0
+        val hasAudioAndVideo = hasAudio && hasVideo && hasWidthAndHeight && length > 0L
+
+        val canFirstPlay = hasAudioOnly || hasAudioAndVideo || retryCount == MAX_RETRY_COUNT
+
+        if (!canFirstPlay && retryCount < MAX_RETRY_COUNT) {
+            retryCount++
+            postDelayed(::setupFirstPlay, 100L)
+            return
+        }
+
+        retryCount = 0
+        onFirstPlay(media)
+        setContentFit()
+        MediaPlayerManager.audioFocusManager.updateAudioFocus()
+    }
+
     fun getMediaTracks(): MediaTracks {
         var mediaTracks = MediaTracks()
 
@@ -338,18 +363,26 @@ class LibVlcPlayerView(
         return mediaTracks
     }
 
+    fun getMediaLength(): Long {
+        var length: Long = 0L
+
+        mediaPlayer?.let { player ->
+            val duration = player.getLength()
+
+            if (duration > 0L) {
+                length = duration
+            }
+        }
+
+        return length
+    }
+
     fun getMediaInfo(): MediaInfo {
         var mediaInfo = MediaInfo()
 
         mediaPlayer?.let { player ->
             val video = player.getCurrentVideoTrack()
-            val duration = player.getLength()
-            val length =
-                if (duration != -1L) {
-                    duration
-                } else {
-                    0L
-                }
+            val length = getMediaLength()
             val seekable = player.isSeekable()
 
             mediaInfo =
@@ -359,13 +392,6 @@ class LibVlcPlayerView(
                     length = length.toDouble(),
                     seekable = seekable,
                 )
-
-            mediaLength =
-                if (length > 0L) {
-                    length
-                } else {
-                    null
-                }
         }
 
         return mediaInfo
@@ -490,8 +516,7 @@ class LibVlcPlayerView(
                 }
             } else {
                 if (type == "position") {
-                    val length = mediaLength ?: 0L
-                    time = (value * length.toDouble()).toInt()
+                    time = (value * getMediaLength().toDouble()).toInt()
                 } else {
                     time = value.toInt()
                 }
@@ -518,19 +543,20 @@ class LibVlcPlayerView(
     fun snapshot(path: String) {
         mediaPlayer?.let { player ->
             try {
-                val textureView = getTextureView() ?: throw Exception()
+                val view = getTextureView() ?: throw Exception()
                 val video = player.getCurrentVideoTrack() ?: throw Exception()
 
-                val surface = Surface(textureView.surfaceTexture)
-                val bitmap = Bitmap.createBitmap(video.width, video.height, Bitmap.Config.ARGB_8888)
+                val width = video.width?.takeIf { it > 0 } ?: throw Exception()
+                val height = video.height?.takeIf { it > 0 } ?: throw Exception()
+
+                val surface = Surface(view.surfaceTexture)
+                val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
 
                 PixelCopy.request(
                     surface,
                     bitmap,
                     { copyResult ->
-                        if (copyResult != PixelCopy.SUCCESS) {
-                            throw Exception()
-                        }
+                        if (copyResult != PixelCopy.SUCCESS) throw Exception()
 
                         val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'")
                         val timestamp = Calendar.getInstance().time
@@ -582,15 +608,15 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
                     onPlaying(Unit)
 
                     if (firstPlay) {
-                        onFirstPlay(getMediaInfo())
-
-                        attachPlayer()
+                        setupFirstPlay()
 
                         setupPlayer()
 
                         firstPlay = false
                     }
 
+                    attachPlayer()
+
                     MediaPlayerManager.keepAwakeManager.activateKeepAwake()
                     MediaPlayerManager.audioFocusManager.updateAudioFocus()
                 }
@@ -609,9 +635,6 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
 
                     MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                     MediaPlayerManager.audioFocusManager.updateAudioFocus()
-
-                    firstPlay = true
-                    firstTime = true
                 }
 
                 Event.EndReached -> {
@@ -632,12 +655,6 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
 
                 Event.TimeChanged -> {
                     onTimeChanged(mapOf("time" to player.getTime().toInt()))
-
-                    if (firstTime) {
-                        MediaPlayerManager.audioFocusManager.updateAudioFocus()
-
-                        firstTime = false
-                    }
                 }
 
                 Event.PositionChanged -> {

package/ios/LibVlcPlayerView.swift

@@ -8,6 +8,8 @@ import UIKit
 
 private let dialogCustomUI: Bool = true
 
+private let maxRetryCount: Int = 10
+
 class LibVlcPlayerView: ExpoView {
     private let playerView = UIView()
 
@@ -15,10 +17,10 @@ class LibVlcPlayerView: ExpoView {
     var vlcDialog: VLCDialogProvider?
     var vlcDialogRef: NSValue?
 
-    var mediaLength: Int32?
     var oldVolume: Int = MediaPlayerConstants.maxPlayerVolume
+
     var firstPlay: Bool = true
-    var firstTime: Bool = true
+    private var retryCount: Int = 0
     private var shouldInit: Bool = true
 
     let onBuffering = EventDispatcher()
@@ -92,7 +94,6 @@ class LibVlcPlayerView: ExpoView {
         }
 
         firstPlay = true
-        firstTime = true
         shouldInit = false
     }
 
@@ -137,16 +138,17 @@ class LibVlcPlayerView: ExpoView {
 
     func setContentFit() {
         DispatchQueue.main.async {
-            let view = self.playerView.frame.size
-
+            let view = self.playerView
             var transform: CGAffineTransform = .identity
 
             if let player = self.mediaPlayer {
                 let video = player.videoSize
+                let width = video.width
+                let height = video.height
 
-                if video != .zero {
-                    let viewAspect = view.width / view.height
-                    let videoAspect = video.width / video.height
+                if width > 0, height > 0 {
+                    let viewAspect = view.frame.size.width / view.frame.size.height
+                    let videoAspect = width / height
 
                     switch self.contentFit {
                     case .contain:
@@ -173,7 +175,7 @@ class LibVlcPlayerView: ExpoView {
                 }
             }
 
-            self.playerView.transform = transform
+            view.transform = transform
         }
     }
 
@@ -183,8 +185,6 @@ class LibVlcPlayerView: ExpoView {
 
             addPlayerSlaves()
 
-            setContentFit()
-
             if scale != MediaPlayerConstants.defaultPlayerScale {
                 player.scaleFactor = scale
             }
@@ -209,6 +209,46 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
+    func setupFirstPlay() {
+        let tracks = getMediaTracks()
+        let media = getMediaInfo()
+        let length = getMediaLength()
+
+        let hasAudio = tracks.audio.contains { track in track.id != -1 }
+        let hasVideo = tracks.video.contains { track in track.id != -1 }
+
+        let hasAudioOnly = hasAudio && !hasVideo && length > 0
+        let hasWidthAndHeight = media.width > 0 && media.height > 0
+        let hasAudioAndVideo = hasAudio && hasVideo && hasWidthAndHeight && length > 0
+
+        let canFirstPlay = hasAudioOnly || hasAudioAndVideo || retryCount == maxRetryCount
+
+        if !canFirstPlay, retryCount < maxRetryCount {
+            retryCount += 1
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in self?.setupFirstPlay() }
+            return
+        }
+
+        retryCount = 0
+        onFirstPlay(media)
+        setContentFit()
+        MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
+    }
+
+    func getMediaLength() -> Int32 {
+        var length: Int32 = 0
+
+        if let player = mediaPlayer, let media = player.media {
+            let duration = media.length.intValue
+
+            if duration > 0 {
+                length = duration
+            }
+        }
+
+        return length
+    }
+
     func getMediaTracks() -> MediaTracks {
         var mediaTracks = MediaTracks()
 
@@ -261,7 +301,7 @@ class LibVlcPlayerView: ExpoView {
 
         if let player = mediaPlayer {
             let video = player.videoSize
-            let length = player.media?.length.intValue ?? 0
+            let length = getMediaLength()
             let seekable = player.isSeekable
 
             mediaInfo = MediaInfo(
@@ -270,10 +310,6 @@ class LibVlcPlayerView: ExpoView {
                 length: Double(length),
                 seekable: seekable,
             )
-
-            mediaLength = length > 0 ?
-                length :
-                nil
         }
 
         return mediaInfo
@@ -387,8 +423,7 @@ class LibVlcPlayerView: ExpoView {
                 }
             } else {
                 if type == "position" {
-                    let length = mediaLength ?? 0
-                    time = Int(value * Double(length))
+                    time = Int(value * Double(getMediaLength()))
                 } else {
                     time = Int(value)
                 }
@@ -416,13 +451,15 @@ class LibVlcPlayerView: ExpoView {
     func snapshot(_ path: String) {
         if let player = mediaPlayer {
             let video = player.videoSize
+            let width = video.width
+            let height = video.height
 
-            if video != .zero {
+            if width > 0, height > 0 {
                 let dateFormatter = DateFormatter()
                 dateFormatter.dateFormat = "yyyy-MM-dd-HH'h'mm'm'ss's'"
                 let snapshotPath = path + "/vlc-snapshot-\(dateFormatter.string(from: Date())).jpg"
 
-                player.saveVideoSnapshot(at: snapshotPath, withWidth: Int32(video.width), andHeight: Int32(video.height))
+                player.saveVideoSnapshot(at: snapshotPath, withWidth: Int32(width), andHeight: Int32(height))
 
                 onSnapshotTaken(["path": snapshotPath])
             } else {
@@ -457,7 +494,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 onPlaying()
 
                 if firstPlay {
-                    onFirstPlay(getMediaInfo())
+                    setupFirstPlay()
 
                     setupPlayer()
 
@@ -476,9 +513,6 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
 
                 MediaPlayerManager.shared.keepAwakeManager.deactivateKeepAwake()
                 MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
-
-                firstPlay = true
-                firstTime = true
             case .ended:
                 onEndReached()
 
@@ -503,12 +537,6 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
         if let player = mediaPlayer {
             onTimeChanged(["time": player.time.intValue])
 
-            if firstTime {
-                MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
-
-                firstTime = false
-            }
-
             onPositionChanged(["position": player.position])
         }
     }

package/package.json

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