extended-vlc-player 0.1.3 → 0.1.4

package/android/build.gradle

@@ -1,15 +1,3 @@
-// Top-level build file for the `extended-vlc-player` local Expo Module.
-buildscript {
-  repositories {
-    google()
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'com.android.tools.build:gradle'
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin'
-  }
-}
-
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'expo-module-gradle-plugin'
@@ -20,8 +8,8 @@ version = '0.1.0'
 android {
   namespace 'expo.modules.extendedvlcplayer'
   defaultConfig {
-    minSdkVersion (findProperty('expo.minSdkVersion') ?: 26).toInteger()
-    targetSdkVersion (findProperty('expo.targetSdkVersion') ?: 34).toInteger()
+    versionCode 1
+    versionName '0.1.0'
   }
   // The libVLC .so files ship native code for four ABIs. The Expo app
   // already filters to its own ABIs in android/app/build.gradle; the host
@@ -32,5 +20,5 @@ android {
 }
 
 dependencies {
-  implementation 'org.videolan.android:libvlc:3.6.0'
+  implementation 'org.videolan.android:libvlc-all:3.6.0'
 }

package/android/src/main/java/expo/modules/extendedvlcplayer/ExtendedVlcPlayerModule.kt

@@ -24,7 +24,7 @@ class ExtendedVlcPlayerModule : Module() {
 
     AsyncFunction("isPictureInPictureSupported") {
       Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
-        appContext.activity?.application?.packageManager?.hasSystemFeature(
+        appContext.currentActivity?.application?.packageManager?.hasSystemFeature(
           android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE
         ) == true
     }
@@ -76,7 +76,7 @@ class ExtendedVlcPlayerModule : Module() {
     }
 
     AsyncFunction("startPictureInPicture") { instanceId: Int ->
-      val activity = appContext.activity ?: return@AsyncFunction false
+      val activity = appContext.currentActivity ?: return@AsyncFunction false
       val session = PlayerRegistry.session(instanceId) ?: return@AsyncFunction false
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return@AsyncFunction false
       val params = PictureInPictureParams.Builder()

package/android/src/main/java/expo/modules/extendedvlcplayer/PlayerSession.kt

@@ -49,9 +49,10 @@ class PlayerSession(
   init {
     surfaceView.holder.addCallback(object : SurfaceHolder.Callback {
       override fun surfaceCreated(holder: SurfaceHolder) {
-        mediaPlayer.vout.setVideoSurface(holder.surface, surfaceView.holder)
+        val vout = mediaPlayer.getVLCVout()
+        vout.setVideoView(surfaceView)
         if (!isAttached) {
-          mediaPlayer.attachViews(arrayOf<Any>(surfaceView).toJavaArray())
+          vout.attachViews()
           isAttached = true
         }
         mediaPlayer.play()
@@ -60,36 +61,40 @@ class PlayerSession(
       override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {}
 
       override fun surfaceDestroyed(holder: SurfaceHolder) {
-        mediaPlayer.vout.setVideoSurface(null, null)
+        val vout = mediaPlayer.getVLCVout()
+        if (vout.areViewsAttached()) {
+          vout.detachViews()
+        }
+        isAttached = false
       }
     })
 
     mediaPlayer.setEventListener { event ->
       when (event.type) {
-        MediaPlayer.Event.Playing -> onPlaying?.invoke(mapOf("duration" to (event.durationMs / 1000.0)))
+        MediaPlayer.Event.Playing -> onPlaying?.invoke(mapOf("duration" to durationSeconds()))
         MediaPlayer.Event.Paused -> onPaused?.invoke(emptyMap())
         MediaPlayer.Event.Stopped -> onEnded?.invoke()
         MediaPlayer.Event.EndReached -> onEnded?.invoke()
         MediaPlayer.Event.EncounteredError -> onError?.invoke(
           mapOf(
-            "message" to (event.escapedVlcError ?: "libVLC error"),
+            "message" to "libVLC error",
             "code" to "VLC_ERROR",
             "domain" to "libVLC"
           )
         )
-        MediaPlayer.Event.Buffering -> onBuffering?.invoke(mapOf("isBuffering" to event.buffering.toDouble() < 100.0))
+        MediaPlayer.Event.Buffering -> onBuffering?.invoke(mapOf("isBuffering" to (event.getBuffering() < 100.0f)))
         MediaPlayer.Event.Opening -> onLoad?.invoke(
           mapOf(
-            "duration" to (event.durationMs / 1000.0),
+            "duration" to durationSeconds(),
             "audioTracks" to emptyList<Map<String, Any>>(),
             "textTracks" to emptyList<Map<String, Any>>()
           )
         )
         MediaPlayer.Event.TimeChanged -> onProgress?.invoke(
           mapOf(
-            "currentTime" to (event.timeChanged / 1000.0),
-            "duration" to (event.durationMs / 1000.0),
-            "position" to (if (event.durationMs > 0) event.timeChanged.toDouble() / event.durationMs else 0.0)
+            "currentTime" to (event.getTimeChanged() / 1000.0),
+            "duration" to durationSeconds(),
+            "position" to (if (mediaPlayer.getLength() > 0) event.getTimeChanged().toDouble() / mediaPlayer.getLength() else 0.0)
           )
         )
       }
@@ -103,6 +108,8 @@ class PlayerSession(
     mediaPlayer.media = media
   }
 
+  private fun durationSeconds(): Double = mediaPlayer.getLength() / 1000.0
+
   fun play() = mediaPlayer.play()
   fun pause() = mediaPlayer.pause()
   fun stop() = mediaPlayer.stop()
@@ -163,6 +170,3 @@ class PlayerSession(
     libVlc.release()
   }
 }
-
-// Helper to convert Kotlin Array to Java Array (libVLC's attachViews is Java).
-private inline fun <reified T> Array<out T>.toJavaArray(): Array<T> = this as Array<T>

package/app.plugin.js

@@ -65,7 +65,7 @@ function withIosPods(config, options) {
 // ---- iOS Info.plist -------------------------------------------------------
 
 const INFOPLIST_TAG = 'extended-vlc-player-info-plist';
-const INFOPLIST_AUDIO_SESSION = '# extended-vlc-player: keep audio session active for PiP and background playback';
+const INFOPLIST_AUDIO_SESSION = '// extended-vlc-player: keep audio session active for PiP and background playback';
 
 function withIosInfoPlist(config) {
   return withInfoPlist(config, (infoPlist) => {
@@ -80,7 +80,7 @@ function withIosInfoPlist(config) {
 // ---- Android build.gradle ------------------------------------------------
 
 const GRADLE_TAG = 'extended-vlc-player-gradle';
-const GRADLE_VLC = (vlcVersion) => `  implementation "org.videolan.android:libvlc:${vlcVersion}"`;
+const GRADLE_VLC = (vlcVersion) => `  implementation "org.videolan.android:libvlc-all:${vlcVersion}"`;
 
 function withAndroidGradle(config, options) {
   const vlcVersion = (options?.android?.libVlcVersion || '3.6.0').toString();

package/ios/ExtendedVlcPlayer.podspec

@@ -24,6 +24,8 @@ Pod::Spec.new do |s|
   s.source_files = '**/*.{h,m,mm,swift}'
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20',
+    'CLANG_CXX_LIBRARY' => 'libc++',
     'SWIFT_OBJC_INTERFACE_HEADER_NAME' => 'ExtendedVlcPlayer-Swift.h',
     'OTHER_SWIFT_FLAGS' => '$(inherited) -D COCOAPODS -Xfrontend -module-name -Xfrontend ExtendedVlcPlayer',
     # The host app's Podfile already enables use_frameworks! :linkage => :static

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extended-vlc-player",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "React Native video player built on MobileVLCKit (iOS) and libVLC (Android) with true iOS Picture-in-Picture via AVSampleBufferDisplayLayer bridge.",
   "license": "MIT",
   "main": "build/index.js",