expo-libvlc-player 3.3.1 → 3.4.0

package/android/build.gradle

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

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

@@ -0,0 +1,29 @@
+package expo.modules.libvlcplayer
+
+import android.app.Activity
+import android.view.WindowManager
+import expo.modules.core.errors.CurrentActivityNotFoundException
+import expo.modules.kotlin.AppContext
+
+class KeepAwakeManager(
+    private val appContext: AppContext?,
+) {
+    private val currentActivity: Activity
+        get() = appContext?.currentActivity ?: throw CurrentActivityNotFoundException()
+
+    fun activateKeepAwake() {
+        currentActivity.let {
+            it.runOnUiThread {
+                it.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+            }
+        }
+    }
+
+    fun deactivateKeepAwake() {
+        currentActivity.let {
+            it.runOnUiThread {
+                it.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+            }
+        }
+    }
+}

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

@@ -67,10 +67,12 @@ class LibVlcPlayerModule : Module() {
             }
 
             OnActivityEntersForeground {
+                MediaPlayerManager.keepAwakeManager.activateKeepAwake()
                 MediaPlayerManager.onModuleForeground()
             }
 
             OnActivityEntersBackground {
+                MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                 MediaPlayerManager.onModuleBackground()
             }
 

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

@@ -98,18 +98,6 @@ class LibVlcPlayerView(
         detachPlayer()
     }
 
-    override fun onLayout(
-        changed: Boolean,
-        left: Int,
-        top: Int,
-        right: Int,
-        bottom: Int,
-    ) {
-        super.onLayout(changed, left, top, right, bottom)
-
-        setContentFit()
-    }
-
     fun getTextureView(): TextureView? = playerView.findViewById(org.videolan.R.id.texture_video)
 
     fun createPlayer() {
@@ -220,10 +208,10 @@ class LibVlcPlayerView(
         mediaPlayer?.let { player ->
             val textureView = getTextureView() ?: return
 
-            val matrix = Matrix()
-
             val video = player.getCurrentVideoTrack()
 
+            val matrix = Matrix()
+
             if (video != null) {
                 val viewWidth = playerView.width.toFloat()
                 val viewHeight = playerView.height.toFloat()
@@ -380,20 +368,14 @@ class LibVlcPlayerView(
         set(value) {
             val old = field
             field = value
-
-            if (!shouldCreate) {
-                shouldCreate = value != old
-            }
+            shouldCreate = value != old
         }
 
     var options: ArrayList<String> = ArrayList()
         set(value) {
             val old = field
             field = value
-
-            if (!shouldCreate) {
-                shouldCreate = value != old
-            }
+            shouldCreate = value != old
         }
 
     var tracks: Tracks? = null
@@ -423,6 +405,10 @@ class LibVlcPlayerView(
         set(value) {
             field = value
             mediaPlayer?.setAspectRatio(value)
+
+            post {
+                setContentFit()
+            }
         }
 
     var contentFit: VideoContentFit = VideoContentFit.CONTAIN

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

@@ -28,12 +28,14 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                             firstPlay = false
                         }
 
+                        MediaPlayerManager.keepAwakeManager.activateKeepAwake()
                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
                     }
 
                     Event.Paused -> {
                         onPaused(Unit)
 
+                        MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
                     }
 
@@ -42,6 +44,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
 
                         detachPlayer()
 
+                        MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
 
                         firstPlay = true
@@ -64,6 +67,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                         val error = mapOf("error" to "Media player encountered an error")
                         onEncounteredError(error)
 
+                        MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
 
                         firstPlay = true

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

@@ -5,6 +5,7 @@ import java.lang.ref.WeakReference
 
 object MediaPlayerManager {
     lateinit var audioFocusManager: AudioFocusManager
+    lateinit var keepAwakeManager: KeepAwakeManager
 
     var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
 
@@ -20,6 +21,10 @@ object MediaPlayerManager {
         if (!this::audioFocusManager.isInitialized) {
             audioFocusManager = AudioFocusManager(appContext)
         }
+
+        if (!this::keepAwakeManager.isInitialized) {
+            keepAwakeManager = KeepAwakeManager(appContext)
+        }
     }
 
     fun onModuleDestroy() {

package/build/LibVlcPlayerView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LibVlcPlayerView.d.ts","sourceRoot":"","sources":["../src/LibVlcPlayerView.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,qBAAqB,EACrB,mBAAmB,EAUpB,MAAM,sBAAsB,CAAC;AAU9B,QAAA,MAAM,gBAAgB,uHAyFrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"LibVlcPlayerView.d.ts","sourceRoot":"","sources":["../src/LibVlcPlayerView.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,qBAAqB,EACrB,mBAAmB,EAUpB,MAAM,sBAAsB,CAAC;AAU9B,QAAA,MAAM,gBAAgB,uHAwFrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/build/LibVlcPlayerView.js

@@ -63,7 +63,7 @@ const LibVlcPlayerView = forwardRef((props, ref) => {
         <NativeView {...props} ref={ref} style={[props.style, { height: "100%" }]} source={parseSource(props.source)} slaves={props.slaves?.map((slave) => ({
             ...slave,
             source: parseSource(slave.source),
-        }))} aspectRatio={!props.contentFit ? props.aspectRatio : null} onEncounteredError={onEncounteredError} onDialogDisplay={onDialogDisplay} onTimeChanged={onTimeChanged} onPositionChanged={onPositionChanged} onESAdded={onESAdded} onRecordChanged={onRecordChanged} onSnapshotTaken={onSnapshotTaken} onFirstPlay={onFirstPlay}/>
+        }))} onEncounteredError={onEncounteredError} onDialogDisplay={onDialogDisplay} onTimeChanged={onTimeChanged} onPositionChanged={onPositionChanged} onESAdded={onESAdded} onRecordChanged={onRecordChanged} onSnapshotTaken={onSnapshotTaken} onFirstPlay={onFirstPlay}/>
       </View>);
 });
 export default LibVlcPlayerView;

package/build/LibVlcPlayerView.js.map

@@ -1 +1 @@
-{"version":3,"file":"LibVlcPlayerView.js","sourceRoot":"","sources":["../src/LibVlcPlayerView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from \"expo\";\nimport { forwardRef, type ComponentType } from \"react\";\nimport { View } from \"react-native\";\n\nimport {\n  LibVlcPlayerViewNativeProps,\n  LibVlcPlayerViewProps,\n  LibVlcPlayerViewRef,\n  type Dialog,\n  type Error,\n  type MediaInfo,\n  type MediaTracks,\n  type NativeEvent,\n  type Position,\n  type Recording,\n  type Snapshot,\n  type Time,\n} from \"./LibVlcPlayer.types\";\nimport { convertAspectRatio } from \"./utils/aspect\";\nimport { parseSource } from \"./utils/assets\";\nimport { convertNativeEvent } from \"./utils/events\";\n\nconst NativeView: ComponentType<LibVlcPlayerViewNativeProps> =\n  requireNativeView(\"ExpoLibVlcPlayer\");\n\nlet loggedRenderingChildrenWarning: boolean = false;\n\nconst LibVlcPlayerView = forwardRef<LibVlcPlayerViewRef, LibVlcPlayerViewProps>(\n  (props, ref) => {\n    if (props.children && !loggedRenderingChildrenWarning) {\n      console.warn(\n        \"The <LibVlcPlayerView> component does not support children. This may lead to inconsistent behaviour or crashes. If you want to render content on top of the LibVlcPlayer, consider using absolute positioning.\",\n      );\n      loggedRenderingChildrenWarning = true;\n    }\n\n    const onEncounteredError = (event: NativeEvent<Error>) => {\n      if (props.onEncounteredError) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onEncounteredError(nativeEvent);\n      }\n    };\n\n    const onDialogDisplay = (event: NativeEvent<Dialog>) => {\n      if (props.onDialogDisplay) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onDialogDisplay(nativeEvent);\n      }\n    };\n\n    const onTimeChanged = (event: NativeEvent<Time>) => {\n      if (props.onTimeChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onTimeChanged(nativeEvent);\n      }\n    };\n\n    const onPositionChanged = (event: NativeEvent<Position>) => {\n      if (props.onPositionChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onPositionChanged(nativeEvent);\n      }\n    };\n\n    const onESAdded = (event: NativeEvent<MediaTracks>) => {\n      if (props.onESAdded) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onESAdded(nativeEvent);\n      }\n    };\n\n    const onRecordChanged = (event: NativeEvent<Recording>) => {\n      if (props.onRecordChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onRecordChanged(nativeEvent);\n      }\n    };\n\n    const onSnapshotTaken = (event: NativeEvent<Snapshot>) => {\n      if (props.onSnapshotTaken) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onSnapshotTaken(nativeEvent);\n      }\n    };\n\n    const onFirstPlay = (event: NativeEvent<MediaInfo>) => {\n      if (props.onFirstPlay) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onFirstPlay(nativeEvent);\n      }\n    };\n\n    return (\n      <View style={{ aspectRatio: convertAspectRatio(props.aspectRatio) }}>\n        <NativeView\n          {...props}\n          ref={ref}\n          style={[props.style, { height: \"100%\" }]}\n          source={parseSource(props.source)}\n          slaves={props.slaves?.map((slave) => ({\n            ...slave,\n            source: parseSource(slave.source)!,\n          }))}\n          aspectRatio={!props.contentFit ? props.aspectRatio : null}\n          onEncounteredError={onEncounteredError}\n          onDialogDisplay={onDialogDisplay}\n          onTimeChanged={onTimeChanged}\n          onPositionChanged={onPositionChanged}\n          onESAdded={onESAdded}\n          onRecordChanged={onRecordChanged}\n          onSnapshotTaken={onSnapshotTaken}\n          onFirstPlay={onFirstPlay}\n        />\n      </View>\n    );\n  },\n);\n\nexport default LibVlcPlayerView;\n"]}
+{"version":3,"file":"LibVlcPlayerView.js","sourceRoot":"","sources":["../src/LibVlcPlayerView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAgBpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,UAAU,GACd,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;AAExC,IAAI,8BAA8B,GAAY,KAAK,CAAC;AAEpD,MAAM,gBAAgB,GAAG,UAAU,CACjC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACtD,OAAO,CAAC,IAAI,CACV,gNAAgN,CACjN,CAAC;QACF,8BAA8B,GAAG,IAAI,CAAC;IACxC,CAAC;IAED,MAAM,kBAAkB,GAAG,CAAC,KAAyB,EAAE,EAAE;QACvD,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,KAA0B,EAAE,EAAE;QACrD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAwB,EAAE,EAAE;QACjD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,KAA4B,EAAE,EAAE;QACzD,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,KAA+B,EAAE,EAAE;QACpD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,KAA6B,EAAE,EAAE;QACxD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,KAA4B,EAAE,EAAE;QACvD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,KAA6B,EAAE,EAAE;QACpD,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9C,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAClE;QAAA,CAAC,UAAU,CACT,IAAI,KAAK,CAAC,CACV,GAAG,CAAC,CAAC,GAAG,CAAC,CACT,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CACzC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAClC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACpC,GAAG,KAAK;YACR,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAE;SACnC,CAAC,CAAC,CAAC,CACJ,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CACvC,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,iBAAiB,CAAC,CAAC,iBAAiB,CAAC,CACrC,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,WAAW,CAAC,CAAC,WAAW,CAAC,EAE7B;MAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,gBAAgB,CAAC","sourcesContent":["import { requireNativeView } from \"expo\";\nimport { forwardRef, type ComponentType } from \"react\";\nimport { View } from \"react-native\";\n\nimport {\n  LibVlcPlayerViewNativeProps,\n  LibVlcPlayerViewProps,\n  LibVlcPlayerViewRef,\n  type Dialog,\n  type Error,\n  type MediaInfo,\n  type MediaTracks,\n  type NativeEvent,\n  type Position,\n  type Recording,\n  type Snapshot,\n  type Time,\n} from \"./LibVlcPlayer.types\";\nimport { convertAspectRatio } from \"./utils/aspect\";\nimport { parseSource } from \"./utils/assets\";\nimport { convertNativeEvent } from \"./utils/events\";\n\nconst NativeView: ComponentType<LibVlcPlayerViewNativeProps> =\n  requireNativeView(\"ExpoLibVlcPlayer\");\n\nlet loggedRenderingChildrenWarning: boolean = false;\n\nconst LibVlcPlayerView = forwardRef<LibVlcPlayerViewRef, LibVlcPlayerViewProps>(\n  (props, ref) => {\n    if (props.children && !loggedRenderingChildrenWarning) {\n      console.warn(\n        \"The <LibVlcPlayerView> component does not support children. This may lead to inconsistent behaviour or crashes. If you want to render content on top of the LibVlcPlayer, consider using absolute positioning.\",\n      );\n      loggedRenderingChildrenWarning = true;\n    }\n\n    const onEncounteredError = (event: NativeEvent<Error>) => {\n      if (props.onEncounteredError) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onEncounteredError(nativeEvent);\n      }\n    };\n\n    const onDialogDisplay = (event: NativeEvent<Dialog>) => {\n      if (props.onDialogDisplay) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onDialogDisplay(nativeEvent);\n      }\n    };\n\n    const onTimeChanged = (event: NativeEvent<Time>) => {\n      if (props.onTimeChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onTimeChanged(nativeEvent);\n      }\n    };\n\n    const onPositionChanged = (event: NativeEvent<Position>) => {\n      if (props.onPositionChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onPositionChanged(nativeEvent);\n      }\n    };\n\n    const onESAdded = (event: NativeEvent<MediaTracks>) => {\n      if (props.onESAdded) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onESAdded(nativeEvent);\n      }\n    };\n\n    const onRecordChanged = (event: NativeEvent<Recording>) => {\n      if (props.onRecordChanged) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onRecordChanged(nativeEvent);\n      }\n    };\n\n    const onSnapshotTaken = (event: NativeEvent<Snapshot>) => {\n      if (props.onSnapshotTaken) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onSnapshotTaken(nativeEvent);\n      }\n    };\n\n    const onFirstPlay = (event: NativeEvent<MediaInfo>) => {\n      if (props.onFirstPlay) {\n        const nativeEvent = convertNativeEvent(event);\n        props.onFirstPlay(nativeEvent);\n      }\n    };\n\n    return (\n      <View style={{ aspectRatio: convertAspectRatio(props.aspectRatio) }}>\n        <NativeView\n          {...props}\n          ref={ref}\n          style={[props.style, { height: \"100%\" }]}\n          source={parseSource(props.source)}\n          slaves={props.slaves?.map((slave) => ({\n            ...slave,\n            source: parseSource(slave.source)!,\n          }))}\n          onEncounteredError={onEncounteredError}\n          onDialogDisplay={onDialogDisplay}\n          onTimeChanged={onTimeChanged}\n          onPositionChanged={onPositionChanged}\n          onESAdded={onESAdded}\n          onRecordChanged={onRecordChanged}\n          onSnapshotTaken={onSnapshotTaken}\n          onFirstPlay={onFirstPlay}\n        />\n      </View>\n    );\n  },\n);\n\nexport default LibVlcPlayerView;\n"]}

package/ios/KeepAwakeManager.swift

@@ -0,0 +1,13 @@
+extension MediaPlayerManager {
+    func activateKeepAwake() {
+        DispatchQueue.main.async {
+            UIApplication.shared.isIdleTimerDisabled = true
+        }
+    }
+
+    func deactivateKeepAwake() {
+        DispatchQueue.main.async {
+            UIApplication.shared.isIdleTimerDisabled = false
+        }
+    }
+}

package/ios/LibVlcPlayerModule.swift

@@ -47,10 +47,12 @@ public class LibVlcPlayerModule: Module {
         }
 
         OnAppEntersForeground {
+            MediaPlayerManager.shared.activateKeepAwake()
             MediaPlayerManager.shared.onModuleForeground()
         }
 
         OnAppEntersBackground {
+            MediaPlayerManager.shared.deactivateKeepAwake()
             MediaPlayerManager.shared.onModuleBackground()
         }
 
@@ -58,63 +60,93 @@ public class LibVlcPlayerModule: Module {
             Events(playerEvents)
 
             Prop("source") { (view: LibVlcPlayerView, source: String?) in
-                view.source = source
+                if source != view.source {
+                    view.source = source
+                }
             }
 
             Prop("options") { (view: LibVlcPlayerView, options: [String]?) in
-                view.options = options ?? [String]()
+                if options != view.options {
+                    view.options = options ?? [String]()
+                }
             }
 
             Prop("tracks") { (view: LibVlcPlayerView, tracks: Tracks?) in
-                view.tracks = tracks
+                if tracks != view.tracks {
+                    view.tracks = tracks
+                }
             }
 
             Prop("slaves") { (view: LibVlcPlayerView, slaves: [Slave]?) in
-                view.slaves = slaves ?? [Slave]()
+                if slaves != view.slaves {
+                    view.slaves = slaves ?? [Slave]()
+                }
             }
 
             Prop("scale") { (view: LibVlcPlayerView, scale: Float?) in
-                view.scale = scale ?? defaultPlayerScale
+                if scale != view.scale {
+                    view.scale = scale ?? defaultPlayerScale
+                }
             }
 
             Prop("aspectRatio") { (view: LibVlcPlayerView, aspectRatio: String?) in
-                view.aspectRatio = aspectRatio
+                if aspectRatio != view.aspectRatio {
+                    view.aspectRatio = aspectRatio
+                }
             }
 
             Prop("contentFit") { (view: LibVlcPlayerView, contentFit: VideoContentFit?) in
-                view.contentFit = contentFit ?? .contain
+                if contentFit != view.contentFit {
+                    view.contentFit = contentFit ?? .contain
+                }
             }
 
             Prop("rate") { (view: LibVlcPlayerView, rate: Float?) in
-                view.rate = rate ?? defaultPlayerRate
+                if rate != view.rate {
+                    view.rate = rate ?? defaultPlayerRate
+                }
             }
 
             Prop("time") { (view: LibVlcPlayerView, time: Int?) in
-                view.time = time ?? defaultPlayerTime
+                if time != view.time {
+                    view.time = time ?? defaultPlayerTime
+                }
             }
 
             Prop("volume") { (view: LibVlcPlayerView, volume: Int?) in
-                view.volume = volume ?? maxPlayerVolume
+                if volume != view.volume {
+                    view.volume = volume ?? maxPlayerVolume
+                }
             }
 
             Prop("mute") { (view: LibVlcPlayerView, mute: Bool?) in
-                view.mute = mute ?? false
+                if mute != view.mute {
+                    view.mute = mute ?? false
+                }
             }
 
             Prop("audioMixingMode") { (view: LibVlcPlayerView, audioMixingMode: AudioMixingMode?) in
-                view.audioMixingMode = audioMixingMode ?? .auto
+                if audioMixingMode != view.audioMixingMode {
+                    view.audioMixingMode = audioMixingMode ?? .auto
+                }
             }
 
             Prop("playInBackground") { (view: LibVlcPlayerView, playInBackground: Bool?) in
-                view.playInBackground = playInBackground ?? false
+                if playInBackground != view.playInBackground {
+                    view.playInBackground = playInBackground ?? false
+                }
             }
 
             Prop("repeat") { (view: LibVlcPlayerView, shouldRepeat: Bool?) in
-                view.shouldRepeat = shouldRepeat ?? false
+                if shouldRepeat != view.shouldRepeat {
+                    view.shouldRepeat = shouldRepeat ?? false
+                }
             }
 
             Prop("autoplay") { (view: LibVlcPlayerView, autoplay: Bool?) in
-                view.autoplay = autoplay ?? true
+                if autoplay != view.autoplay {
+                    view.autoplay = autoplay ?? true
+                }
             }
 
             OnViewDidUpdateProps { (view: LibVlcPlayerView) in

package/ios/LibVlcPlayerView.swift

@@ -49,11 +49,11 @@ class LibVlcPlayerView: ExpoView {
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
 
-        playerView.backgroundColor = .black
         clipsToBounds = true
+        playerView.backgroundColor = .black
+        addSubview(playerView)
 
         MediaPlayerManager.shared.registerPlayerView(self)
-        addSubview(playerView)
     }
 
     deinit {
@@ -61,12 +61,10 @@ class LibVlcPlayerView: ExpoView {
         destroyPlayer()
     }
 
-    override func layoutSubviews() {
-        super.layoutSubviews()
-
-        setContentFit()
-
-        playerView.frame = bounds
+    override var bounds: CGRect {
+        didSet {
+            playerView.frame = bounds
+        }
     }
 
     func createPlayer() {
@@ -147,11 +145,12 @@ class LibVlcPlayerView: ExpoView {
 
     func setContentFit() {
         if let player = mediaPlayer {
-            var transform: CGAffineTransform = .identity
-
             let view = playerView.bounds.size
+
             let video = player.videoSize
 
+            var transform: CGAffineTransform = .identity
+
             if video != .zero {
                 let viewAspect = view.width / view.height
                 let videoAspect = video.width / video.height
@@ -262,8 +261,8 @@ class LibVlcPlayerView: ExpoView {
                 player.scaleFactor = scale
             }
 
-            if let aspectRatio = aspectRatio {
-                aspectRatio.withCString { cString in
+            if let ratio = aspectRatio {
+                ratio.withCString { cString in
                     player.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
                 }
             }
@@ -333,13 +332,17 @@ class LibVlcPlayerView: ExpoView {
 
     var aspectRatio: String? {
         didSet {
-            if let aspectRatio = aspectRatio {
-                aspectRatio.withCString { cString in
+            if let ratio = aspectRatio {
+                ratio.withCString { cString in
                     mediaPlayer?.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
                 }
             } else {
                 mediaPlayer?.videoAspectRatio = nil
             }
+
+            DispatchQueue.main.async {
+                self.setContentFit()
+            }
         }
     }
 

package/ios/MediaPlayerDelegate.swift

@@ -23,14 +23,17 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     firstPlay = false
                 }
 
+                MediaPlayerManager.shared.activateKeepAwake()
                 MediaPlayerManager.shared.setAppropriateAudioSession()
             case .paused:
                 onPaused()
 
+                MediaPlayerManager.shared.deactivateKeepAwake()
                 MediaPlayerManager.shared.setAppropriateAudioSession()
             case .stopped:
                 onStopped()
 
+                MediaPlayerManager.shared.deactivateKeepAwake()
                 MediaPlayerManager.shared.setAppropriateAudioSession()
 
                 firstPlay = true
@@ -49,6 +52,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 let error = ["error": "Media player encountered an error"]
                 onEncounteredError(error)
 
+                MediaPlayerManager.shared.deactivateKeepAwake()
                 MediaPlayerManager.shared.setAppropriateAudioSession()
 
                 firstPlay = true

package/ios/Records/Tracks.swift

@@ -1,6 +1,6 @@
 import ExpoModulesCore
 
-struct Tracks: Record {
+struct Tracks: Record, Equatable {
     @Field
     var audio: Int = 0
 
@@ -9,4 +9,10 @@ struct Tracks: Record {
 
     @Field
     var subtitle: Int = 0
+
+    static func == (lhs: Tracks, rhs: Tracks) -> Bool {
+        lhs.audio == rhs.audio &&
+            lhs.video == rhs.video &&
+            lhs.subtitle == rhs.subtitle
+    }
 }

package/package.json

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

package/src/LibVlcPlayerView.tsx

@@ -101,7 +101,6 @@ const LibVlcPlayerView = forwardRef<LibVlcPlayerViewRef, LibVlcPlayerViewProps>(
             ...slave,
             source: parseSource(slave.source)!,
           }))}
-          aspectRatio={!props.contentFit ? props.aspectRatio : null}
           onEncounteredError={onEncounteredError}
           onDialogDisplay={onDialogDisplay}
           onTimeChanged={onTimeChanged}