Skip to content

Optimize memory management and performance in Windows and Mac video player. #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdroidFilter merged 4 commits into from
Aug 24, 2025
Merged

Optimize memory management and performance in Windows and Mac video player. #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7e276c
Refactor MediaFoundationLib to use JNA direct mapping
kdroidFilter Aug 24, 2025
af0d638
Optimize resize handling in `WindowsVideoPlayerState`
kdroidFilter Aug 24, 2025
379cdf0
Hint GC after resource cleanup in `WindowsVideoPlayerState` to optimi…
kdroidFilter Aug 24, 2025
e2a611d
Refactor `SharedVideoPlayer` from interface to object with direct JNA…
kdroidFilter Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 33 additions & 34 deletions mediaplayer/src/jvmMain/kotlin/io/github/kdroidfilter/composemediaplayer/mac/AvPlayerLib.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
package io.github.kdroidfilter.composemediaplayer.mac

import com.sun.jna.Library
import com.sun.jna.Native
import com.sun.jna.Pointer

/**
* JNA interface to the native library.
* Includes new methods to retrieve frame rate information.
* JNA direct mapping to the native library.
* Includes methods to retrieve frame rate and metadata information.
*/
internal interface SharedVideoPlayer : Library {
fun createVideoPlayer(): Pointer?
fun openUri(context: Pointer?, uri: String?)
fun playVideo(context: Pointer?)
fun pauseVideo(context: Pointer?)
fun setVolume(context: Pointer?, volume: Float)
fun getVolume(context: Pointer?): Float
fun getLatestFrame(context: Pointer?): Pointer?
fun getFrameWidth(context: Pointer?): Int
fun getFrameHeight(context: Pointer?): Int
fun getVideoFrameRate(context: Pointer?): Float
fun getScreenRefreshRate(context: Pointer?): Float
fun getCaptureFrameRate(context: Pointer?): Float
fun getVideoDuration(context: Pointer?): Double
fun getCurrentTime(context: Pointer?): Double
fun seekTo(context: Pointer?, time: Double)
fun disposeVideoPlayer(context: Pointer?)
fun getLeftAudioLevel(context: Pointer?): Float
fun getRightAudioLevel(context: Pointer?): Float
fun setPlaybackSpeed(context: Pointer?, speed: Float)
fun getPlaybackSpeed(context: Pointer?): Float
internal object SharedVideoPlayer {
init {
// Register the native library for direct mapping
Native.register("NativeVideoPlayer")
}

// Metadata retrieval functions
fun getVideoTitle(context: Pointer?): String?
fun getVideoBitrate(context: Pointer?): Long
fun getVideoMimeType(context: Pointer?): String?
fun getAudioChannels(context: Pointer?): Int
fun getAudioSampleRate(context: Pointer?): Int
@JvmStatic external fun createVideoPlayer(): Pointer?
@JvmStatic external fun openUri(context: Pointer?, uri: String?)
@JvmStatic external fun playVideo(context: Pointer?)
@JvmStatic external fun pauseVideo(context: Pointer?)
@JvmStatic external fun setVolume(context: Pointer?, volume: Float)
@JvmStatic external fun getVolume(context: Pointer?): Float
@JvmStatic external fun getLatestFrame(context: Pointer?): Pointer?
@JvmStatic external fun getFrameWidth(context: Pointer?): Int
@JvmStatic external fun getFrameHeight(context: Pointer?): Int
@JvmStatic external fun getVideoFrameRate(context: Pointer?): Float
@JvmStatic external fun getScreenRefreshRate(context: Pointer?): Float
@JvmStatic external fun getCaptureFrameRate(context: Pointer?): Float
@JvmStatic external fun getVideoDuration(context: Pointer?): Double
@JvmStatic external fun getCurrentTime(context: Pointer?): Double
@JvmStatic external fun seekTo(context: Pointer?, time: Double)
@JvmStatic external fun disposeVideoPlayer(context: Pointer?)
@JvmStatic external fun getLeftAudioLevel(context: Pointer?): Float
@JvmStatic external fun getRightAudioLevel(context: Pointer?): Float
@JvmStatic external fun setPlaybackSpeed(context: Pointer?, speed: Float)
@JvmStatic external fun getPlaybackSpeed(context: Pointer?): Float

companion object {
val INSTANCE: SharedVideoPlayer =
Native.load("NativeVideoPlayer", SharedVideoPlayer::class.java)
}
// Metadata retrieval functions
@JvmStatic external fun getVideoTitle(context: Pointer?): String?
@JvmStatic external fun getVideoBitrate(context: Pointer?): Long
@JvmStatic external fun getVideoMimeType(context: Pointer?): String?
@JvmStatic external fun getAudioChannels(context: Pointer?): Int
@JvmStatic external fun getAudioSampleRate(context: Pointer?): Int
}
64 changes: 32 additions & 32 deletions ...r/src/jvmMain/kotlin/io/github/kdroidfilter/composemediaplayer/mac/MacVideoPlayerState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
private suspend fun initPlayer() = ioScope.launch {
macLogger.d { "initPlayer() - Creating native player" }
try {
val ptr = SharedVideoPlayer.INSTANCE.createVideoPlayer()
val ptr = SharedVideoPlayer.createVideoPlayer()
if (ptr != null) {
mainMutex.withLock { playerPtr = ptr }
macLogger.d { "Native player created successfully" }
Expand All @@ -208,9 +208,9 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val ptr = mainMutex.withLock { playerPtr } ?: return

try {
videoFrameRate = SharedVideoPlayer.INSTANCE.getVideoFrameRate(ptr)
screenRefreshRate = SharedVideoPlayer.INSTANCE.getScreenRefreshRate(ptr)
captureFrameRate = SharedVideoPlayer.INSTANCE.getCaptureFrameRate(ptr)
videoFrameRate = SharedVideoPlayer.getVideoFrameRate(ptr)
screenRefreshRate = SharedVideoPlayer.getScreenRefreshRate(ptr)
captureFrameRate = SharedVideoPlayer.getCaptureFrameRate(ptr)
macLogger.d { "Frame Rates - Video: $videoFrameRate, Screen: $screenRefreshRate, Capture: $captureFrameRate" }
} catch (e: Exception) {
if (e is CancellationException) throw e
Expand Down Expand Up @@ -316,7 +316,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
// Release resources outside of the mutex lock
ptrToDispose?.let {
try {
SharedVideoPlayer.INSTANCE.disposeVideoPlayer(it)
SharedVideoPlayer.disposeVideoPlayer(it)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error disposing player: ${e.message}" }
Expand All @@ -334,7 +334,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val isPlayerNull = mainMutex.withLock { playerPtr == null }

if (isPlayerNull) {
val ptr = SharedVideoPlayer.INSTANCE.createVideoPlayer()
val ptr = SharedVideoPlayer.createVideoPlayer()
if (ptr != null) {
mainMutex.withLock { playerPtr = ptr }
applyVolume()
Expand Down Expand Up @@ -365,7 +365,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {

return try {
// Open video asynchronously
SharedVideoPlayer.INSTANCE.openUri(ptr, uri)
SharedVideoPlayer.openUri(ptr, uri)

// Instead of directly calling `updateMetadata()`,
// we poll until valid dimensions are available
Expand All @@ -390,8 +390,8 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
*/
private suspend fun pollDimensionsUntilReady(ptr: Pointer, maxAttempts: Int = 20) {
for (attempt in 1..maxAttempts) {
val width = SharedVideoPlayer.INSTANCE.getFrameWidth(ptr)
val height = SharedVideoPlayer.INSTANCE.getFrameHeight(ptr)
val width = SharedVideoPlayer.getFrameWidth(ptr)
val height = SharedVideoPlayer.getFrameHeight(ptr)

if (width > 0 && height > 0) {
macLogger.d { "Dimensions validated (w=$width, h=$height) after $attempt attempts" }
Expand All @@ -409,10 +409,10 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val ptr = mainMutex.withLock { playerPtr } ?: return

try {
val width = SharedVideoPlayer.INSTANCE.getFrameWidth(ptr)
val height = SharedVideoPlayer.INSTANCE.getFrameHeight(ptr)
val duration = SharedVideoPlayer.INSTANCE.getVideoDuration(ptr).toLong()
val frameRate = SharedVideoPlayer.INSTANCE.getVideoFrameRate(ptr)
val width = SharedVideoPlayer.getFrameWidth(ptr)
val height = SharedVideoPlayer.getFrameHeight(ptr)
val duration = SharedVideoPlayer.getVideoDuration(ptr).toLong()
val frameRate = SharedVideoPlayer.getVideoFrameRate(ptr)

// Calculate aspect ratio
val newAspectRatio = if (width > 0 && height > 0) {
Expand All @@ -424,11 +424,11 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
}

// Get additional metadata
val title = SharedVideoPlayer.INSTANCE.getVideoTitle(ptr)
val bitrate = SharedVideoPlayer.INSTANCE.getVideoBitrate(ptr)
val mimeType = SharedVideoPlayer.INSTANCE.getVideoMimeType(ptr)
val audioChannels = SharedVideoPlayer.INSTANCE.getAudioChannels(ptr)
val audioSampleRate = SharedVideoPlayer.INSTANCE.getAudioSampleRate(ptr)
val title = SharedVideoPlayer.getVideoTitle(ptr)
val bitrate = SharedVideoPlayer.getVideoBitrate(ptr)
val mimeType = SharedVideoPlayer.getVideoMimeType(ptr)
val audioChannels = SharedVideoPlayer.getAudioChannels(ptr)
val audioSampleRate = SharedVideoPlayer.getAudioSampleRate(ptr)

withContext(Dispatchers.Main) {
// Update metadata
Expand Down Expand Up @@ -537,15 +537,15 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val ptr = mainMutex.withLock { playerPtr } ?: return

// Get frame dimensions
val width = SharedVideoPlayer.INSTANCE.getFrameWidth(ptr)
val height = SharedVideoPlayer.INSTANCE.getFrameHeight(ptr)
val width = SharedVideoPlayer.getFrameWidth(ptr)
val height = SharedVideoPlayer.getFrameHeight(ptr)

if (width <= 0 || height <= 0) {
return
}

// Get the latest frame to minimize mutex lock time
val framePtr = SharedVideoPlayer.INSTANCE.getLatestFrame(ptr) ?: return
val framePtr = SharedVideoPlayer.getLatestFrame(ptr) ?: return

// Create or reuse a buffered image on a compute thread
val bufferedImage = withContext(Dispatchers.Default) {
Expand Down Expand Up @@ -599,8 +599,8 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
try {
val ptr = mainMutex.withLock { playerPtr }
if (ptr != null) {
val newLeft = SharedVideoPlayer.INSTANCE.getLeftAudioLevel(ptr)
val newRight = SharedVideoPlayer.INSTANCE.getRightAudioLevel(ptr)
val newLeft = SharedVideoPlayer.getLeftAudioLevel(ptr)
val newRight = SharedVideoPlayer.getRightAudioLevel(ptr)
// macLogger.d { "Audio levels fetched: L=$newLeft, R=$newRight" }

// Converts the linear level to a percentage on a logarithmic scale.
Expand Down Expand Up @@ -710,7 +710,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val ptr = mainMutex.withLock { playerPtr } ?: return

try {
SharedVideoPlayer.INSTANCE.playVideo(ptr)
SharedVideoPlayer.playVideo(ptr)

withContext(Dispatchers.Main) {
isPlaying = true
Expand All @@ -737,7 +737,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
val ptr = mainMutex.withLock { playerPtr } ?: return

try {
SharedVideoPlayer.INSTANCE.pauseVideo(ptr)
SharedVideoPlayer.pauseVideo(ptr)

withContext(Dispatchers.Main) {
isPlaying = false
Expand Down Expand Up @@ -803,10 +803,10 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
lastFrameUpdateTime = System.currentTimeMillis()

val ptr = mainMutex.withLock { playerPtr } ?: return
SharedVideoPlayer.INSTANCE.seekTo(ptr, seekTime.toDouble())
SharedVideoPlayer.seekTo(ptr, seekTime.toDouble())

if (isPlaying) {
SharedVideoPlayer.INSTANCE.playVideo(ptr)
SharedVideoPlayer.playVideo(ptr)
// Reduce delay to update frame faster for local videos
delay(10)
updateFrameAsync()
Expand Down Expand Up @@ -854,7 +854,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
ptrToDispose?.let {
macLogger.d { "dispose() - Disposing native player" }
try {
SharedVideoPlayer.INSTANCE.disposeVideoPlayer(it)
SharedVideoPlayer.disposeVideoPlayer(it)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error disposing player: ${e.message}" }
Expand Down Expand Up @@ -919,7 +919,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
private suspend fun getPositionSafely(): Double {
val ptr = mainMutex.withLock { playerPtr } ?: return 0.0
return try {
SharedVideoPlayer.INSTANCE.getCurrentTime(ptr)
SharedVideoPlayer.getCurrentTime(ptr)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error getting position: ${e.message}" }
Expand All @@ -931,7 +931,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
private suspend fun getDurationSafely(): Double {
val ptr = mainMutex.withLock { playerPtr } ?: return 0.0
return try {
SharedVideoPlayer.INSTANCE.getVideoDuration(ptr)
SharedVideoPlayer.getVideoDuration(ptr)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error getting duration: ${e.message}" }
Expand All @@ -948,7 +948,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
mainMutex.withLock {
playerPtr?.let { ptr ->
try {
SharedVideoPlayer.INSTANCE.setVolume(ptr, _volumeState.value)
SharedVideoPlayer.setVolume(ptr, _volumeState.value)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error applying volume: ${e.message}" }
Expand All @@ -966,7 +966,7 @@ class MacVideoPlayerState : PlatformVideoPlayerState {
mainMutex.withLock {
playerPtr?.let { ptr ->
try {
SharedVideoPlayer.INSTANCE.setPlaybackSpeed(ptr, _playbackSpeedState.value)
SharedVideoPlayer.setPlaybackSpeed(ptr, _playbackSpeedState.value)
} catch (e: Exception) {
if (e is CancellationException) throw e
macLogger.e { "Error applying playback speed: ${e.message}" }
Expand Down
Loading
Loading