expo-libvlc-player 6.1.12 → 6.1.14

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

@@ -290,50 +290,48 @@ class LibVlcPlayerView(
             val view = getTextureView(layout) ?: return@post
             val matrix = Matrix()
 
-            mediaPlayer?.let { player ->
-                val video = getVideoSize()
+            val video = getVideoSize()
 
-                if (hasVideoSize) {
-                    val viewWidth = view.width.toFloat()
-                    val viewHeight = view.height.toFloat()
+            if (hasVideoSize) {
+                val viewWidth = view.width.toFloat()
+                val viewHeight = view.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
-                        }
-
-                        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
+                when (contentFit) {
+                    VideoContentFit.CONTAIN -> {
+                        // No scale required
+                    }
 
+                    VideoContentFit.COVER -> {
+                        val scale =
                             if (videoAspect > viewAspect) {
-                                scaleY = videoAspect / viewAspect
+                                videoAspect / viewAspect
                             } else {
-                                scaleX = viewAspect / videoAspect
+                                viewAspect / videoAspect
                             }
 
-                            matrix.setScale(scaleX, scaleY, pivotX, pivotY)
+                        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)
                     }
                 }
             }
@@ -417,12 +415,10 @@ class LibVlcPlayerView(
     fun getMediaLength(): Long {
         var length: Long = 0L
 
-        mediaPlayer?.let { player ->
-            val duration = player.getLength()
+        val duration = mediaPlayer?.getLength() ?: 0L
 
-            if (duration > 0L) {
-                length = duration
-            }
+        if (duration > 0L) {
+            length = duration
         }
 
         return length
@@ -431,19 +427,17 @@ class LibVlcPlayerView(
     fun getMediaInfo(): MediaInfo {
         var mediaInfo = MediaInfo()
 
-        mediaPlayer?.let { player ->
-            val video = getVideoSize()
-            val length = getMediaLength()
-            val seekable = player.isSeekable()
-
-            mediaInfo =
-                MediaInfo(
-                    width = video.width,
-                    height = video.height,
-                    length = length.toDouble(),
-                    seekable = seekable,
-                )
-        }
+        val video = getVideoSize()
+        val length = getMediaLength()
+        val seekable = mediaPlayer?.isSeekable() ?: false
+
+        mediaInfo =
+            MediaInfo(
+                width = video.width,
+                height = video.height,
+                length = length.toDouble(),
+                seekable = seekable,
+            )
 
         return mediaInfo
     }
@@ -655,24 +649,25 @@ class LibVlcPlayerView(
     }
 
     fun snapshot(path: String) {
-        mediaPlayer?.let { player ->
-            try {
-                val view = getTextureView(playerLayout) ?: throw Exception()
-
-                if (!hasVideoSize) throw Exception()
+        try {
+            val view = getTextureView(playerLayout) ?: throw Exception()
 
-                val surface = Surface(view.surfaceTexture)
-                val video = getVideoSize()
-                val bitmap = Bitmap.createBitmap(video.width, video.height, Bitmap.Config.ARGB_8888)
+            if (!hasVideoSize) throw Exception()
 
-                PixelCopy.request(
-                    surface,
-                    bitmap,
-                    { copyResult ->
-                        if (copyResult != PixelCopy.SUCCESS) {
-                            onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
-                        }
+            val surface = Surface(view.surfaceTexture)
+            val video = getVideoSize()
+            val bitmap = Bitmap.createBitmap(video.width, video.height, Bitmap.Config.ARGB_8888)
+
+            PixelCopy.request(
+                surface,
+                bitmap,
+                { copyResult ->
+                    if (copyResult != PixelCopy.SUCCESS) {
+                        onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
+                        return@request
+                    }
 
+                    try {
                         val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'")
                         val timestamp = simpleDateFormat.format(Calendar.getInstance().time)
 
@@ -684,12 +679,14 @@ class LibVlcPlayerView(
                         }
 
                         onSnapshotTaken(mapOf("path" to snapshotPath))
-                    },
-                    Handler(Looper.getMainLooper()),
-                )
-            } catch (_: Exception) {
-                onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
-            }
+                    } catch (_: Exception) {
+                        onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
+                    }
+                },
+                Handler(Looper.getMainLooper()),
+            )
+        } catch (_: Exception) {
+            onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
         }
     }
 

package/ios/ExpoLibVlcPlayer.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'VLCKit', '4.0.0a18'
+  s.dependency 'VLCKit', '4.0.0a19'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package/ios/LibVlcPlayerView.swift

@@ -250,12 +250,10 @@ class LibVlcPlayerView: ExpoView {
     func getMediaLength() -> Int32 {
         var length: Int32 = 0
 
-        if let player = mediaPlayer, let media = player.media {
-            let duration = media.length.intValue
+        let duration = mediaPlayer?.media?.length.intValue ?? 0
 
-            if duration > 0 {
-                length = duration
-            }
+        if duration > 0 {
+            length = duration
         }
 
         return length
@@ -296,18 +294,16 @@ class LibVlcPlayerView: ExpoView {
     func getMediaInfo() -> MediaInfo {
         var mediaInfo = MediaInfo()
 
-        if let player = mediaPlayer {
-            let video = getVideoSize()
-            let length = getMediaLength()
-            let seekable = player.isSeekable
-
-            mediaInfo = MediaInfo(
-                width: Int(video.width),
-                height: Int(video.height),
-                length: Double(length),
-                seekable: seekable
-            )
-        }
+        let video = getVideoSize()
+        let length = getMediaLength()
+        let seekable = mediaPlayer?.isSeekable ?? false
+
+        mediaInfo = MediaInfo(
+            width: Int(video.width),
+            height: Int(video.height),
+            length: Double(length),
+            seekable: seekable
+        )
 
         return mediaInfo
     }

package/package.json

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