expo-libvlc-player 3.2.3 → 3.2.5

package/README.md

@@ -43,34 +43,10 @@ For bare React Native projects, you must ensure that you have [installed and con
 
 No additional configuration necessary.
 
-#### Black screen issue
-
-On Android, the `libvlcjni` player detaches from the View when surfaces are destroyed after switching screens.
-
-The current workaround attaches the View once surfaces are created but this results in a brief black screen.
-
-https://code.videolan.org/videolan/vlc-android/-/issues/1495
-
 ### Configure for iOS
 
 Run `npx pod-install` after installing the npm package.
 
-#### Local network privacy
-
-On iOS, the `VLCKit` player seems to interact with the local network when playing media from external sources.
-
-Starting in iOS 14, a clear message must be provided to the `NSLocalNetworkUsageDescription` key in the Info.plist file.
-
-https://developer.apple.com/documentation/technotes/tn3179-understanding-local-network-privacy
-
-#### Audio playback issue
-
-On iOS, the `VLCKit` player experiences a small audio delay when resuming or muting media playback.
-
-This might be related to the internal clock used by the library core causing inaccurate time values.
-
-https://code.videolan.org/videolan/VLCKit/-/issues/233
-
 ### Configure for TV
 
 Set the `EXPO_TV` environment variable, and run prebuild to make the TV modifications to the project.
@@ -268,6 +244,32 @@ The `LibVlcPlayerView` extends React Native `ViewProps` and implements the follo
 }
 ```
 
+## Known issues
+
+#### Black screen
+
+On Android, the `libvlcjni` player detaches from the View when its surface is destroyed after switching screens.
+
+The current workaround attaches the View once a surface is created but this causes a brief black screen.
+
+https://code.videolan.org/videolan/vlc-android/-/issues/1495
+
+#### Local network
+
+On iOS, the `VLCKit` player seems to interact with the local network when playing media from external sources.
+
+A clear message must be provided to the `NSLocalNetworkUsageDescription` key in the Info.plist file.
+
+https://developer.apple.com/documentation/technotes/tn3179-understanding-local-network-privacy
+
+#### Audio delay
+
+On iOS, the `VLCKit` player experiences a small audio delay when resuming or muting media playback.
+
+This might be related to the internal clock used by the library core causing inaccurate time values.
+
+https://code.videolan.org/videolan/VLCKit/-/issues/233
+
 ## Disclaimer
 
 This project is not affiliated with, endorsed by, or officially supported by VideoLAN. The VLC icon is trademark of VideoLAN and is used here solely to indicate compatibility with the following **LibVLC** bindings:

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "3.2.3"
+version = "3.2.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.2.3"
+        versionName "3.2.5"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -55,33 +55,33 @@ class LibVlcPlayerView(
             addView(it)
         }
 
-    internal var libVLC: LibVLC? = null
-    internal var mediaPlayer: MediaPlayer? = null
+    var libVLC: LibVLC? = null
+    var mediaPlayer: MediaPlayer? = null
     private var media: Media? = null
-    internal var vlcDialog: VLCDialog? = null
+    var vlcDialog: VLCDialog? = null
 
-    internal var mediaLength: Long = 0L
-    internal var oldVolume: Int = MAX_PLAYER_VOLUME
+    var mediaLength: Long = 0L
+    var oldVolume: Int = MAX_PLAYER_VOLUME
 
     private var shouldCreate: Boolean = false
-    internal var firstPlay: Boolean = false
-    internal var firstTime: Boolean = false
-
-    internal val onBuffering by EventDispatcher<Unit>()
-    internal val onPlaying by EventDispatcher<Unit>()
-    internal val onPaused by EventDispatcher<Unit>()
-    internal val onStopped by EventDispatcher<Unit>()
-    internal val onEndReached by EventDispatcher<Unit>()
-    internal val onEncounteredError by EventDispatcher()
-    internal val onDialogDisplay by EventDispatcher<Dialog>()
-    internal val onTimeChanged by EventDispatcher()
-    internal val onPositionChanged by EventDispatcher()
-    internal val onESAdded by EventDispatcher<MediaTracks>()
-    internal val onRecordChanged by EventDispatcher<Recording>()
-    internal val onSnapshotTaken by EventDispatcher()
-    internal val onFirstPlay by EventDispatcher<MediaInfo>()
-    internal val onForeground by EventDispatcher<Unit>()
-    internal val onBackground by EventDispatcher<Unit>()
+    var firstPlay: Boolean = false
+    var firstTime: Boolean = false
+
+    val onBuffering by EventDispatcher<Unit>()
+    val onPlaying by EventDispatcher<Unit>()
+    val onPaused by EventDispatcher<Unit>()
+    val onStopped by EventDispatcher<Unit>()
+    val onEndReached by EventDispatcher<Unit>()
+    val onEncounteredError by EventDispatcher()
+    val onDialogDisplay by EventDispatcher<Dialog>()
+    val onTimeChanged by EventDispatcher()
+    val onPositionChanged by EventDispatcher()
+    val onESAdded by EventDispatcher<MediaTracks>()
+    val onRecordChanged by EventDispatcher<Recording>()
+    val onSnapshotTaken by EventDispatcher()
+    val onFirstPlay by EventDispatcher<MediaInfo>()
+    val onForeground by EventDispatcher<Unit>()
+    val onBackground by EventDispatcher<Unit>()
 
     init {
         MediaPlayerManager.registerPlayerView(this)
@@ -99,6 +99,8 @@ class LibVlcPlayerView(
         detachPlayer()
     }
 
+    fun getTextureView(): TextureView? = playerView.findViewById(org.videolan.R.id.texture_video)
+
     fun createPlayer() {
         if (!shouldCreate) {
             return
@@ -205,50 +207,53 @@ class LibVlcPlayerView(
 
     fun setContentFit() {
         mediaPlayer?.let { player ->
-            val textureView = playerView.findViewById<TextureView>(org.videolan.R.id.texture_video) ?: return
-            val video = player.getCurrentVideoTrack() ?: return
+            val textureView = getTextureView() ?: return
 
-            val viewWidth = playerView.width.toFloat()
-            val viewHeight = playerView.height.toFloat()
+            val matrix = Matrix()
 
-            val videoWidth = video.width.toFloat()
-            val videoHeight = video.height.toFloat()
+            val video = player.getCurrentVideoTrack()
 
-            val viewAspect = viewWidth / viewHeight
-            val videoAspect = videoWidth / videoHeight
+            if (video != null) {
+                val viewWidth = playerView.width.toFloat()
+                val viewHeight = playerView.height.toFloat()
 
-            val pivotX = viewWidth / 2f
-            val pivotY = viewHeight / 2f
+                val videoWidth = video.width.toFloat()
+                val videoHeight = video.height.toFloat()
 
-            val matrix = Matrix()
+                val viewAspect = viewWidth / viewHeight
+                val videoAspect = videoWidth / videoHeight
 
-            when (contentFit) {
-                VideoContentFit.CONTAIN -> {
-                    // No scale required
-                }
+                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
 
-                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)
                 }
             }
 
@@ -556,7 +561,7 @@ class LibVlcPlayerView(
     fun snapshot(path: String) {
         mediaPlayer?.let { player ->
             try {
-                val textureView = playerView.findViewById<TextureView>(org.videolan.R.id.texture_video) ?: throw Exception()
+                val textureView = getTextureView() ?: throw Exception()
                 val video = player.getCurrentVideoTrack() ?: throw Exception()
 
                 val surface = Surface(textureView.surfaceTexture)
@@ -620,7 +625,7 @@ class LibVlcPlayerView(
         return this.any { option -> option in options }
     }
 
-    internal fun ArrayList<String>.hasRepeatOption(): Boolean {
+    fun ArrayList<String>.hasRepeatOption(): Boolean {
         val options =
             setOf(
                 "--input-repeat=",
@@ -635,7 +640,7 @@ class LibVlcPlayerView(
         }
     }
 
-    internal fun ArrayList<String>.hasStartPausedOption(): Boolean {
+    private fun ArrayList<String>.hasStartPausedOption(): Boolean {
         val options =
             setOf(
                 "--start-paused",
@@ -646,7 +651,7 @@ class LibVlcPlayerView(
         return this.any { option -> option in options }
     }
 
-    internal fun ArrayList<String>.removeStartPausedOption() {
+    private fun ArrayList<String>.removeStartPausedOption() {
         val options =
             setOf(
                 "--start-paused",

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

@@ -7,7 +7,7 @@ import java.lang.ref.WeakReference
 object MediaPlayerManager {
     lateinit var audioFocusManager: AudioFocusManager
 
-    internal var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
+    var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
 
     fun registerPlayerView(view: LibVlcPlayerView) {
         playerViews.find { it.get() == view } ?: run { playerViews.add(WeakReference(view)) }

package/ios/LibVlcPlayerView.swift

@@ -145,35 +145,37 @@ class LibVlcPlayerView: ExpoView {
 
     func setContentFit() {
         if let player = mediaPlayer {
+            var transform: CGAffineTransform = .identity
+
             let view = playerView.bounds.size
             let video = player.videoSize
 
-            let viewAspect = view.width / view.height
-            let videoAspect = video.width / video.height
-
-            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
+                    }
 
-            switch contentFit {
-            case .contain:
-                // No transform required
-                break
-            case .cover:
-                var 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
@@ -188,9 +190,8 @@ class LibVlcPlayerView: ExpoView {
 
             if let audios = player.audioTrackNames as? [String] {
                 if let audioIndexes = player.audioTrackIndexes as? [NSNumber] {
-                    for (index, trackName) in audios.enumerated() {
-                        let trackId = audioIndexes[index].intValue
-                        let track = Track(id: trackId, name: trackName)
+                    for (index, trackName) in zip(audioIndexes, audios) {
+                        let track = Track(id: index.intValue, name: trackName)
                         audioTracks.append(track)
                     }
                 }
@@ -200,9 +201,8 @@ class LibVlcPlayerView: ExpoView {
 
             if let videos = player.videoTrackNames as? [String] {
                 if let videoIndexes = player.videoTrackIndexes as? [NSNumber] {
-                    for (index, trackName) in videos.enumerated() {
-                        let trackId = videoIndexes[index].intValue
-                        let track = Track(id: trackId, name: trackName)
+                    for (index, trackName) in zip(videoIndexes, videos) {
+                        let track = Track(id: index.intValue, name: trackName)
                         videoTracks.append(track)
                     }
                 }
@@ -212,9 +212,8 @@ class LibVlcPlayerView: ExpoView {
 
             if let subtitles = player.videoSubTitlesNames as? [String] {
                 if let subtitleIndexes = player.videoSubTitlesIndexes as? [NSNumber] {
-                    for (index, trackName) in subtitles.enumerated() {
-                        let trackId = subtitleIndexes[index].intValue
-                        let track = Track(id: trackId, name: trackName)
+                    for (index, trackName) in zip(subtitleIndexes, subtitles) {
+                        let track = Track(id: index.intValue, name: trackName)
                         subtitleTracks.append(track)
                     }
                 }
@@ -536,7 +535,7 @@ extension Array where Element == String {
     }
 }
 
-extension Array where Element == String {
+private extension Array where Element == String {
     func hasStartPausedOption() -> Bool {
         let options = [
             "--start-paused",
@@ -548,7 +547,7 @@ extension Array where Element == String {
     }
 }
 
-extension Array where Element == String {
+private extension Array where Element == String {
     mutating func removeStartPausedOption() {
         let options = [
             "--start-paused",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -35,7 +35,7 @@
     "@eslint/js": "^9.30.0",
     "@types/react": "~19.0.0",
     "eslint": "^9.30.0",
-    "expo": "~53.0.26",
+    "expo": "~53.0.27",
     "expo-module-scripts": "^4.1.6",
     "globals": "^16.2.0",
     "husky": "^9.1.7",