expo-libvlc-player 6.1.13 → 6.1.15

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

@@ -262,7 +262,7 @@ class LibVlcPlayerView(
         selectTrack(spuTrack, IMedia.Track.Type.Text)
     }
 
-    fun addPlayerSlaves() {
+    fun addPlayerSlaves(slaves: List<Slave>) {
         slaves.forEach { slave ->
             val source = slave.source
             val type = slave.type
@@ -290,50 +290,48 @@ class LibVlcPlayerView(
             val view = getTextureView(layout) ?: return@post
             val matrix = Matrix()
 
-            mediaPlayer?.let { player ->
-                val video = getVideoSize()
-
-                if (hasVideoSize) {
-                    val viewWidth = view.width.toFloat()
-                    val viewHeight = view.height.toFloat()
-
-                    val videoWidth = video.width.toFloat()
-                    val videoHeight = video.height.toFloat()
-
-                    val viewAspect = viewWidth / viewHeight
-                    val videoAspect = videoWidth / videoHeight
+            val video = getVideoSize()
 
-                    val pivotX = viewWidth / 2f
-                    val pivotY = viewHeight / 2f
+            if (hasVideoSize) {
+                val viewWidth = view.width.toFloat()
+                val viewHeight = view.height.toFloat()
 
-                    when (contentFit) {
-                        VideoContentFit.CONTAIN -> {
-                            // No scale required
-                        }
+                val videoWidth = video.width.toFloat()
+                val videoHeight = video.height.toFloat()
 
-                        VideoContentFit.COVER -> {
-                            val scale =
-                                if (videoAspect > viewAspect) {
-                                    videoAspect / viewAspect
-                                } else {
-                                    viewAspect / videoAspect
-                                }
+                val viewAspect = viewWidth / viewHeight
+                val videoAspect = videoWidth / videoHeight
 
-                            matrix.setScale(scale, scale, pivotX, pivotY)
-                        }
+                val pivotX = viewWidth / 2f
+                val pivotY = viewHeight / 2f
 
-                        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)
                     }
                 }
             }
@@ -345,7 +343,7 @@ class LibVlcPlayerView(
     fun setupPlayer() {
         post {
             mediaPlayer?.let { player ->
-                addPlayerSlaves()
+                addPlayerSlaves(slaves)
 
                 if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
                     player.setScale(scale)
@@ -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
     }
@@ -505,7 +499,7 @@ class LibVlcPlayerView(
             field = field.apply { addAll(newSlaves) }
 
             if (!newSlaves.isEmpty()) {
-                addPlayerSlaves()
+                addPlayerSlaves(newSlaves)
             }
         }
 
@@ -604,7 +598,10 @@ class LibVlcPlayerView(
 
                 mediaPlayer?.let { player ->
                     val shouldPause = condition == true && player.isPlaying()
-                    if (shouldPause) player.pause()
+
+                    if (shouldPause) {
+                        player.pause()
+                    }
                 }
             }
     }
@@ -655,46 +652,44 @@ class LibVlcPlayerView(
     }
 
     fun snapshot(path: String) {
-        mediaPlayer?.let { player ->
-            try {
-                val view = getTextureView(playerLayout) ?: throw Exception()
-
-                if (!hasVideoSize) throw Exception()
-
-                val surface = Surface(view.surfaceTexture)
-                val video = getVideoSize()
-                val bitmap = Bitmap.createBitmap(video.width, video.height, Bitmap.Config.ARGB_8888)
+        try {
+            val view = getTextureView(playerLayout) ?: throw Exception()
 
-                PixelCopy.request(
-                    surface,
-                    bitmap,
-                    { copyResult ->
-                        if (copyResult != PixelCopy.SUCCESS) {
-                            onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
-                            return@request
-                        }
+            if (!hasVideoSize) throw Exception()
 
-                        try {
-                            val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'")
-                            val timestamp = simpleDateFormat.format(Calendar.getInstance().time)
+            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
+                    }
 
-                            val snapshotPath = path + "/vlc-snapshot-$timestamp.jpg"
-                            val file = File(snapshotPath)
+                    try {
+                        val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'")
+                        val timestamp = simpleDateFormat.format(Calendar.getInstance().time)
 
-                            FileOutputStream(file).use { stream ->
-                                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream)
-                            }
+                        val snapshotPath = path + "/vlc-snapshot-$timestamp.jpg"
+                        val file = File(snapshotPath)
 
-                            onSnapshotTaken(mapOf("path" to snapshotPath))
-                        } catch (_: Exception) {
-                            onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
+                        FileOutputStream(file).use { stream ->
+                            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream)
                         }
-                    },
-                    Handler(Looper.getMainLooper()),
-                )
-            } catch (_: Exception) {
-                onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
-            }
+
+                        onSnapshotTaken(mapOf("path" to snapshotPath))
+                    } 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

@@ -157,7 +157,7 @@ class LibVlcPlayerView: ExpoView {
         selectTrack(textTrack, .text)
     }
 
-    func addPlayerSlaves() {
+    func addPlayerSlaves(_ slaves: [Slave]) {
         for slave in slaves {
             let source = slave.source
             let type = slave.type
@@ -220,7 +220,7 @@ class LibVlcPlayerView: ExpoView {
             guard let self else { return }
 
             if let player = mediaPlayer {
-                addPlayerSlaves()
+                addPlayerSlaves(slaves)
 
                 if scale != MediaPlayerConstants.defaultPlayerScale {
                     player.scaleFactor = scale
@@ -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
     }
@@ -364,7 +360,7 @@ class LibVlcPlayerView: ExpoView {
             _slaves += newSlaves
 
             if !newSlaves.isEmpty {
-                addPlayerSlaves()
+                addPlayerSlaves(newSlaves)
             }
         }
     }
@@ -446,7 +442,10 @@ class LibVlcPlayerView: ExpoView {
     func pauseIf(_ condition: Bool? = true) {
         if let player = mediaPlayer {
             let shouldPause = condition == true && player.isPlaying
-            if shouldPause { player.pause() }
+
+            if shouldPause {
+                player.pause()
+            }
         }
     }
 

package/package.json

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