expo-libvlc-player 7.0.12 → 7.0.13

package/README.md

@@ -120,19 +120,19 @@ See the [Example App](example/App.tsx) for additional usage.
 
 ### View methods
 
-| Method                                                           | Description                                                                                                                                       | Returns         |
-| ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `play()`                                                         | Starts playback of the current player                                                                                                             | `Promise<void>` |
-| `pause()`                                                        | Pauses playback of the current player                                                                                                             | `Promise<void>` |
-| `stop()`                                                         | Stops playback of the current player                                                                                                              | `Promise<void>` |
-| `seek(value: number, type?: "time" \| "position")`               | Sets the time or position of the current player. Value must be a number equal or greater than `0` and type defaults to `"time"`                   | `Promise<void>` |
-| `record(path?: string)`                                          | Starts or stops recording the current media. Path must be a valid directory or `undefined` to stop recording                                      | `Promise<void>` |
-| `snapshot(path: string)`                                         | Takes a snapshot of the current media. Path must be a valid directory                                                                             | `Promise<void>` |
-| `postAction(action: 1 \| 2)`                                     | Posts an answer to a [`Dialog`](#dialog). Action must be either `1` or `2`                                                                        | `Promise<void>` |
-| `postLogin(username: string, password: string, store?: boolean)` | Posts a username and password to a login [`Dialog`](#dialog). Username can't be empty, password can be empty and if `true`, store the credentials | `Promise<void>` |
-| `dismiss()`                                                      | Dismisses a [`Dialog`](#dialog)                                                                                                                   | `Promise<void>` |
-| `startPictureInPicture()`                                        | Enters Picture-in-Picture (PiP) mode. Config plugin has to be configured for Picture-in-Picture (PiP) to work                                     | `Promise<void>` |
-| `stopPictureInPicture()`                                         | Exits Picture-in-Picture (PiP) mode on iOS                                                                                                        | `Promise<void>` |
+| Method                                                           | Description                                                                                                                          | Returns         |
+| ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | --------------- |
+| `play()`                                                         | Starts playback of the current player                                                                                                | `Promise<void>` |
+| `pause()`                                                        | Pauses playback of the current player                                                                                                | `Promise<void>` |
+| `stop()`                                                         | Stops playback of the current player                                                                                                 | `Promise<void>` |
+| `seek(value: number, type?: "time" \| "position")`               | Sets the time or position of the current player. Value must be a number equal or greater than `0` and type defaults to `"time"`      | `Promise<void>` |
+| `record(path?: string)`                                          | Starts or stops recording the current media. Path must be a valid directory or `undefined` to stop recording                         | `Promise<void>` |
+| `snapshot(path: string)`                                         | Takes a snapshot of the current media. Path must be a valid directory                                                                | `Promise<void>` |
+| `postAction(action: 1 \| 2)`                                     | Posts an answer to a dialog. Action must be either `1` or `2`                                                                        | `Promise<void>` |
+| `postLogin(username: string, password: string, store?: boolean)` | Posts a username and password to a login dialog. Username can't be empty, password can be empty and if `true`, store the credentials | `Promise<void>` |
+| `dismiss()`                                                      | Dismisses a dialog                                                                                                                   | `Promise<void>` |
+| `startPictureInPicture()`                                        | Enters Picture-in-Picture (PiP) mode. Config plugin has to be configured for Picture-in-Picture (PiP) to work                        | `Promise<void>` |
+| `stopPictureInPicture()`                                         | Exits Picture-in-Picture (PiP) mode on iOS                                                                                           | `Promise<void>` |
 
 ### View props
 
@@ -165,7 +165,7 @@ The `LibVlcPlayerView` extends React Native `ViewProps` and implements the follo
 | `onPaused`                | Called after the `Paused` player event                       |                               |
 | `onStopped`               | Called after the `Stopped` player event                      |                               |
 | `onEncounteredError`      | Called after the `EncounteredError` player event             | [`Error`](#error)             |
-| `onDialogDisplay`         | Called after a `Dialog` needs to be displayed                | [`Dialog`](#dialog)           |
+| `onDialogDisplay`         | Called after a dialog needs to be displayed                  | [`Dialog`](#dialog)           |
 | `onTimeChanged`           | Called after the `TimeChanged` player event                  | [`Time`](#time)               |
 | `onPositionChanged`       | Called after the `PositionChanged` player event              | [`Position`](#position)       |
 | `onESAdded`               | Called after the `ESAdded` player event                      | [`MediaTracks`](#mediatracks) |
@@ -179,38 +179,6 @@ The `LibVlcPlayerView` extends React Native `ViewProps` and implements the follo
 
 ### Module types
 
-#### `Error`
-
-```ts
-interface Error {
-  message: string;
-}
-```
-
-#### `Time`
-
-```ts
-interface Time {
-  value: number;
-}
-```
-
-#### `Position`
-
-```ts
-interface Position {
-  value: number;
-}
-```
-
-#### `Snapshot`
-
-```ts
-interface Snapshot {
-  path: string;
-}
-```
-
 #### `Tracks`
 
 ```ts
@@ -231,6 +199,14 @@ interface Slave {
 }
 ```
 
+#### `Error`
+
+```ts
+interface Error {
+  message: string;
+}
+```
+
 #### `Dialog`
 
 ```ts
@@ -244,12 +220,19 @@ interface Dialog {
 }
 ```
 
-#### `Recording`
+#### `Time`
 
 ```ts
-interface Recording {
-  path: string | null;
-  isRecording: boolean;
+interface Time {
+  value: number;
+}
+```
+
+#### `Position`
+
+```ts
+interface Position {
+  value: number;
 }
 ```
 
@@ -272,6 +255,23 @@ interface MediaTracks {
 }
 ```
 
+#### `Recording`
+
+```ts
+interface Recording {
+  path: string | null;
+  isRecording: boolean;
+}
+```
+
+#### `Snapshot`
+
+```ts
+interface Snapshot {
+  path: string;
+}
+```
+
 #### `MediaInfo`
 
 ```ts
@@ -317,7 +317,7 @@ https://developer.apple.com/documentation/technotes/tn3179-understanding-local-n
 
 ## 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:
+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:
 
 - `libvlcjni` for Android / Android TV
 - `VLCKit` for iOS / Apple TV
@@ -326,11 +326,11 @@ For official VLC products and support, please visit [videolan.org](https://www.v
 
 ## Credits
 
-This library is inspired by existing projects such as [expo-video](https://github.com/expo/expo/tree/main/packages/expo-video) and [react-native-vlc-media-player](https://github.com/razorRun/react-native-vlc-media-player).
+This library is inspired by existing projects such as [react-native-vlc-media-player](https://github.com/razorRun/react-native-vlc-media-player) and [expo-video](https://github.com/expo/expo/tree/main/packages/expo-video).
 
 ## Contributing
 
-Contributions are always welcome. Please raise any issues and/or fix them by creating a pull request.
+Contributions are always welcome. Please raise any issues or fix them by creating a pull request.
 
 ## License
 

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

@@ -722,18 +722,19 @@ class LibVlcPlayerView(
     fun retryUntil(
         maxRetries: Int = MediaPlayerConstants.MAX_RETRY_COUNT,
         retry: Int = 0,
-        delay: Long = MediaPlayerConstants.RETRY_DELAY_MS,
+        delay: Double = MediaPlayerConstants.RETRY_DELAY_MS,
         block: (isLastAttempt: Boolean) -> Boolean,
     ) {
         val isLastAttempt = retry >= maxRetries
 
         if (block(isLastAttempt) || isLastAttempt) return
 
-        val expDelay = (delay.toDouble() * 1.5).toLong()
+        val expDelay = delay * MediaPlayerConstants.EXP_DELAY_MULTIPLIER
+        val postDelay = delay.toLong()
 
         postDelayed({
             retryUntil(maxRetries, retry + 1, expDelay, block)
-        }, delay)
+        }, postDelay)
     }
 }
 
@@ -766,7 +767,7 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                     return@retryUntil hasVideoOut
                                 }
 
-                                retryUntil { isLastAttempt ->
+                                retryUntil {
                                     if (hasVideoSize) {
                                         setContentFit(layout = playerLayout)
                                         setContentFit(layout = pictureLayout)
@@ -775,7 +776,7 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                     return@retryUntil hasVideoSize
                                 }
 
-                                retryUntil { isLastAttempt ->
+                                retryUntil {
                                     if (hasAudioOut) {
                                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
                                     }

package/android/src/main/java/expo/modules/libvlcplayer/constants/MediaPlayerConstants.kt

@@ -16,6 +16,7 @@ object MediaPlayerConstants {
     const val SEEK_STEP_MS: Long = 10_000L
 
     const val COROUTINE_DELAY_MS: Long = 1_000L
-    const val RETRY_DELAY_MS: Long = 200L
+    const val EXP_DELAY_MULTIPLIER: Double = 1.5
+    const val RETRY_DELAY_MS: Double = 200.0
     const val MAX_RETRY_COUNT: Int = 5
 }

package/ios/Constants/MediaPlayerConstants.swift

@@ -5,6 +5,7 @@ enum MediaPlayerConstants {
     static let minPlayerVolume: Int = 0
     static let maxPlayerVolume: Int = 100
 
-    static let retryDelayMs: Int = 200
+    static let expDelayMultiplier: Double = 1.5
+    static let retryDelayMs: Double = 200.0
     static let maxRetryCount: Int = 5
 }

package/ios/LibVlcPlayerView.swift

@@ -224,7 +224,7 @@ class LibVlcPlayerView: ExpoView {
 
                 if volume != MediaPlayerConstants.maxPlayerVolume || mute {
                     // Audio instance not ready, try again
-                    retryUntil { [weak self] isLastAttempt in
+                    retryUntil { [weak self] _ in
                         guard let self else { return true }
 
                         let newVolume = mute ?
@@ -233,7 +233,7 @@ class LibVlcPlayerView: ExpoView {
 
                         player.audio?.volume = Int32(newVolume)
 
-                        return isLastAttempt
+                        return false
                     }
                 }
 
@@ -480,10 +480,6 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    private func snapshotExists(_ path: String) -> Bool {
-        FileManager.default.fileExists(atPath: path)
-    }
-
     func snapshot(_ path: String) {
         if hasVideoSize {
             let dateFormatter = DateFormatter()
@@ -491,24 +487,16 @@ class LibVlcPlayerView: ExpoView {
             let timestamp = dateFormatter.string(from: Date())
 
             let snapshotPath = path + "/vlc-snapshot-\(timestamp).jpg"
-            let video = getVideoSize()
+            let video = CGSize(width: 0, height: 0) // Use original window size
 
             mediaPlayer?.saveVideoSnapshot(at: snapshotPath, withWidth: Int32(video.width), andHeight: Int32(video.height))
 
-            retryUntil { [weak self] isLastAttempt in
-                guard let self else { return true }
-
-                let hasSnapshot = snapshotExists(snapshotPath)
+            let fileExists = FileManager.default.fileExists(atPath: snapshotPath)
 
-                if hasSnapshot {
-                    onSnapshotTaken(["path": snapshotPath])
-                } else if !isLastAttempt {
-                    mediaPlayer?.saveVideoSnapshot(at: snapshotPath, withWidth: Int32(0), andHeight: Int32(0))
-                } else {
-                    onEncounteredError(["message": "Snapshot could not be taken"])
-                }
-
-                return hasSnapshot
+            if fileExists {
+                onSnapshotTaken(["path": snapshotPath])
+            } else {
+                onEncounteredError(["message": "Snapshot could not be taken"])
             }
         } else {
             onEncounteredError(["message": "Snapshot could not be taken"])
@@ -566,16 +554,17 @@ class LibVlcPlayerView: ExpoView {
     func retryUntil(
         maxRetries: Int = MediaPlayerConstants.maxRetryCount,
         retry: Int = 0,
-        delay: Int = MediaPlayerConstants.retryDelayMs,
+        delay: Double = MediaPlayerConstants.retryDelayMs,
         block: @escaping (_ isLastAttempt: Bool) -> Bool
     ) {
         let isLastAttempt = retry >= maxRetries
 
         if block(isLastAttempt) || isLastAttempt { return }
 
-        let expDelay = Int(Double(delay) * 1.5)
+        let deadline = DispatchTime.now() + .milliseconds(Int(delay))
+        let expDelay = delay * MediaPlayerConstants.expDelayMultiplier
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(delay)) { [weak self] in
+        DispatchQueue.main.asyncAfter(deadline: deadline) { [weak self] in
             self?.retryUntil(maxRetries: maxRetries, retry: retry + 1, delay: expDelay, block: block)
         }
     }

package/package.json

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