expo-libvlc-player 3.4.3 → 3.4.5

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "3.4.3"
+version = "3.4.5"
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -27,7 +27,7 @@ android {
     namespace "expo.modules.libvlcplayer"
     defaultConfig {
         versionCode 1
-        versionName "3.4.3"
+        versionName "3.4.5"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -60,7 +60,7 @@ class LibVlcPlayerView(
     private var media: Media? = null
     var vlcDialog: VLCDialog? = null
 
-    var mediaLength: Long = 0L
+    var mediaLength: Long? = null
 
     private var shouldCreate: Boolean = false
     var firstPlay: Boolean = false
@@ -203,58 +203,60 @@ class LibVlcPlayerView(
     }
 
     fun setContentFit() {
-        mediaPlayer?.let { player ->
-            val textureView = getTextureView() ?: return
+        post {
+            mediaPlayer?.let { player ->
+                val textureView = getTextureView() ?: return@post
 
-            val video = player.getCurrentVideoTrack()
+                val video = player.getCurrentVideoTrack()
 
-            val matrix = Matrix()
+                val matrix = Matrix()
 
-            if (video != null) {
-                val viewWidth = playerView.width.toFloat()
-                val viewHeight = playerView.height.toFloat()
+                if (video != null) {
+                    val viewWidth = playerView.width.toFloat()
+                    val viewHeight = playerView.height.toFloat()
 
-                val videoWidth = video.width.toFloat()
-                val videoHeight = video.height.toFloat()
+                    val videoWidth = video.width.toFloat()
+                    val videoHeight = video.height.toFloat()
 
-                val viewAspect = viewWidth / viewHeight
-                val videoAspect = videoWidth / videoHeight
+                    val viewAspect = viewWidth / viewHeight
+                    val videoAspect = videoWidth / videoHeight
 
-                val pivotX = viewWidth / 2f
-                val pivotY = viewHeight / 2f
+                    val pivotX = viewWidth / 2f
+                    val pivotY = viewHeight / 2f
 
-                when (contentFit) {
-                    VideoContentFit.CONTAIN -> {
-                        // No scale required
-                    }
+                    when (contentFit) {
+                        VideoContentFit.CONTAIN -> {
+                            // No scale required
+                        }
+
+                        VideoContentFit.COVER -> {
+                            val scale =
+                                if (videoAspect > viewAspect) {
+                                    videoAspect / viewAspect
+                                } else {
+                                    viewAspect / videoAspect
+                                }
+
+                            matrix.setScale(scale, scale, pivotX, pivotY)
+                        }
+
+                        VideoContentFit.FILL -> {
+                            var scaleX = 1f
+                            var scaleY = 1f
 
-                    VideoContentFit.COVER -> {
-                        val scale =
                             if (videoAspect > viewAspect) {
-                                videoAspect / viewAspect
+                                scaleY = videoAspect / viewAspect
                             } else {
-                                viewAspect / videoAspect
+                                scaleX = viewAspect / videoAspect
                             }
 
-                        matrix.setScale(scale, scale, pivotX, pivotY)
-                    }
-
-                    VideoContentFit.FILL -> {
-                        var scaleX = 1f
-                        var scaleY = 1f
-
-                        if (videoAspect > viewAspect) {
-                            scaleY = videoAspect / viewAspect
-                        } else {
-                            scaleX = viewAspect / videoAspect
+                            matrix.setScale(scaleX, scaleY, pivotX, pivotY)
                         }
-
-                        matrix.setScale(scaleX, scaleY, pivotX, pivotY)
                     }
                 }
-            }
 
-            textureView.setTransform(matrix)
+                textureView.setTransform(matrix)
+            }
         }
     }
 
@@ -321,7 +323,12 @@ class LibVlcPlayerView(
                     tracks = mediaTracks,
                 )
 
-            mediaLength = length
+            mediaLength =
+                if (length > 0L) {
+                    length
+                } else {
+                    null
+                }
         }
 
         return mediaInfo
@@ -398,10 +405,7 @@ class LibVlcPlayerView(
     var aspectRatio: String? = null
         set(value) {
             field = value
-
-            post {
-                setContentFit()
-            }
+            setContentFit()
         }
 
     var contentFit: VideoContentFit = VideoContentFit.CONTAIN
@@ -515,7 +519,8 @@ class LibVlcPlayerView(
                 }
             } else {
                 if (type == "position") {
-                    time = (value * mediaLength.toDouble()).toInt()
+                    val length = mediaLength ?: 0L
+                    time = (value * length.toDouble()).toInt()
                 } else {
                     time = value.toInt()
                 }

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

@@ -75,7 +75,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                         onTimeChanged(mapOf("time" to player.getTime().toInt()))
 
                         if (firstTime) {
-                            if (mediaLength == 0L) {
+                            if (mediaLength == null) {
                                 onFirstPlay(getMediaInfo())
                             }
 

package/ios/LibVlcPlayerView.swift

@@ -23,7 +23,7 @@ class LibVlcPlayerView: ExpoView {
     var vlcDialog: VLCDialogProvider?
     var vlcDialogRef: NSValue?
 
-    var mediaLength: Int32 = 0
+    var mediaLength: Int32?
     private var oldVolume: Int = maxPlayerVolume
 
     private var shouldCreate: Bool = false
@@ -143,42 +143,44 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func setContentFit() {
-        if let player = mediaPlayer {
-            let view = playerView.frame.size
-
-            let video = player.videoSize
-
-            var transform: CGAffineTransform = .identity
-
-            if video != .zero {
-                let viewAspect = view.width / view.height
-                let videoAspect = video.width / video.height
-
-                switch contentFit {
-                case .contain:
-                    // No transform required
-                    break
-                case .cover:
-                    let scale = videoAspect > viewAspect ?
-                        videoAspect / viewAspect :
-                        viewAspect / videoAspect
-
-                    transform = CGAffineTransform(scaleX: scale, y: scale)
-                case .fill:
-                    var scaleX = 1.0
-                    var scaleY = 1.0
-
-                    if videoAspect > viewAspect {
-                        scaleY = videoAspect / viewAspect
-                    } else {
-                        scaleX = viewAspect / videoAspect
+        DispatchQueue.main.async {
+            if let player = self.mediaPlayer {
+                let view = self.playerView.frame.size
+
+                let video = player.videoSize
+
+                var transform: CGAffineTransform = .identity
+
+                if video != .zero {
+                    let viewAspect = view.width / view.height
+                    let videoAspect = video.width / video.height
+
+                    switch self.contentFit {
+                    case .contain:
+                        // No transform required
+                        break
+                    case .cover:
+                        let scale = videoAspect > viewAspect ?
+                            videoAspect / viewAspect :
+                            viewAspect / videoAspect
+
+                        transform = CGAffineTransform(scaleX: scale, y: scale)
+                    case .fill:
+                        var scaleX = 1.0
+                        var scaleY = 1.0
+
+                        if videoAspect > viewAspect {
+                            scaleY = videoAspect / viewAspect
+                        } else {
+                            scaleX = viewAspect / videoAspect
+                        }
+
+                        transform = CGAffineTransform(scaleX: scaleX, y: scaleY)
                     }
-
-                    transform = CGAffineTransform(scaleX: scaleX, y: scaleY)
                 }
-            }
 
-            playerView.transform = transform
+                self.playerView.transform = transform
+            }
         }
     }
 
@@ -246,7 +248,9 @@ class LibVlcPlayerView: ExpoView {
                 tracks: mediaTracks,
             )
 
-            mediaLength = length
+            mediaLength = length > 0 ?
+                length :
+                nil
         }
 
         return mediaInfo
@@ -325,9 +329,7 @@ class LibVlcPlayerView: ExpoView {
 
     var aspectRatio: String? {
         didSet {
-            DispatchQueue.main.async {
-                self.setContentFit()
-            }
+            setContentFit()
         }
     }
 
@@ -428,7 +430,8 @@ class LibVlcPlayerView: ExpoView {
                 }
             } else {
                 if type == "position" {
-                    time = Int(value * Double(mediaLength))
+                    let length = mediaLength ?? 0
+                    time = Int(value * Double(length))
                 } else {
                     time = Int(value)
                 }

package/ios/MediaPlayerDelegate.swift

@@ -67,7 +67,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
             onTimeChanged(["time": player.time.intValue])
 
             if firstTime {
-                if mediaLength == 0 {
+                if mediaLength == nil {
                     onFirstPlay(getMediaInfo())
                 }
 

package/package.json

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