Milan Jurkulak 1 an în urmă
părinte
comite
c2238f2e4f

+ 0 - 4
composeApp/src/desktopMain/kotlin/org/mjdev/desktop/components/video/CallbackVideoSurface.kt

@@ -1,6 +1,5 @@
 package org.mjdev.desktop.components.video
 package org.mjdev.desktop.components.video
 
 
-import org.mjdev.desktop.log.Log
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat
@@ -16,7 +15,6 @@ class CallbackVideoSurface(
     ) -> Unit = { _, _, _, _ -> }
     ) -> Unit = { _, _, _, _ -> }
 ) : BufferFormatCallback {
 ) : BufferFormatCallback {
     override fun getBufferFormat(sourceWidth: Int, sourceHeight: Int): BufferFormat {
     override fun getBufferFormat(sourceWidth: Int, sourceHeight: Int): BufferFormat {
-        Log.d("Got buffer format for source width: $sourceWidth, height: $sourceHeight")
         return RV32BufferFormat(sourceWidth, sourceHeight)
         return RV32BufferFormat(sourceWidth, sourceHeight)
     }
     }
 
 
@@ -26,13 +24,11 @@ class CallbackVideoSurface(
         displayWidth: Int,
         displayWidth: Int,
         displayHeight: Int
         displayHeight: Int
     ) {
     ) {
-        Log.d("New Size : bufferWidth: $bufferWidth, bufferHeight: $bufferHeight, displayWidth: $displayWidth, displayHeight: $displayHeight")
         onNewSize(bufferWidth, bufferHeight, displayWidth, displayHeight)
         onNewSize(bufferWidth, bufferHeight, displayWidth, displayHeight)
     }
     }
 
 
     override fun allocatedBuffers(buffers: Array<out ByteBuffer>?) {
     override fun allocatedBuffers(buffers: Array<out ByteBuffer>?) {
         val buffSize = buffers?.get(0)?.limit() ?: 0
         val buffSize = buffers?.get(0)?.limit() ?: 0
-        Log.d("Allocated buffers with size: $buffSize")
         renderCallback.allocateBuffers(ByteArray(buffSize))
         renderCallback.allocateBuffers(ByteArray(buffSize))
     }
     }
 }
 }

+ 5 - 15
composeApp/src/desktopMain/kotlin/org/mjdev/desktop/components/video/RenderCallback.kt

@@ -5,21 +5,19 @@ import androidx.compose.ui.graphics.asComposeImageBitmap
 import org.jetbrains.skia.Bitmap
 import org.jetbrains.skia.Bitmap
 import org.jetbrains.skia.ColorAlphaType
 import org.jetbrains.skia.ColorAlphaType
 import org.jetbrains.skia.ImageInfo
 import org.jetbrains.skia.ImageInfo
-import org.mjdev.desktop.log.Log
 import uk.co.caprica.vlcj.player.base.MediaPlayer
 import uk.co.caprica.vlcj.player.base.MediaPlayer
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback
 import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback
 import java.nio.ByteBuffer
 import java.nio.ByteBuffer
 
 
 class RenderCallback(
 class RenderCallback(
-    val onImageRender: (imageBitmap: ImageBitmap?) -> Unit
+    private val onImageRender: (imageBitmap: ImageBitmap?) -> Unit
 ) : RenderCallback {
 ) : RenderCallback {
-    var pos: Float = -1f
-    var imageBitmap: ImageBitmap? = null
-    var byteArray: ByteArray? = null
+    private var pos: Float = -1f
+    private var imageBitmap: ImageBitmap? = null
+    private var byteArray: ByteArray? = null
 
 
     override fun lock(mediaPlayer: MediaPlayer?) {
     override fun lock(mediaPlayer: MediaPlayer?) {
-        Log.d("Locked media player: ${mediaPlayer?.status()?.isPlaying}")
     }
     }
 
 
     override fun display(
     override fun display(
@@ -29,19 +27,13 @@ class RenderCallback(
         displayWidth: Int,
         displayWidth: Int,
         displayHeight: Int
         displayHeight: Int
     ) {
     ) {
-        Log.d("Display called with width: $displayWidth, height: $displayHeight")
         val isPlaying = mediaPlayer?.status()?.isPlaying == true
         val isPlaying = mediaPlayer?.status()?.isPlaying == true
-        val newPos = mediaPlayer?.status()?.position() ?: -1f
-        Log.d("Display position: $newPos, isPlaying: $isPlaying")
-        if (isPlaying && pos != newPos) {
-            Log.d("Creating image frame at position: $newPos")
+        if (isPlaying) {
             pos = mediaPlayer?.status()?.position() ?: 0f
             pos = mediaPlayer?.status()?.position() ?: 0f
-            Log.d("Getting data from native buffers")
             nativeBuffers?.get(0)?.apply {
             nativeBuffers?.get(0)?.apply {
                 get(byteArray)
                 get(byteArray)
                 rewind()
                 rewind()
             }
             }
-            Log.d("Creating image bitmap with size: ${byteArray?.size ?: 0}")
             imageBitmap = Bitmap().apply {
             imageBitmap = Bitmap().apply {
                 allocPixels(
                 allocPixels(
                     ImageInfo.makeN32(
                     ImageInfo.makeN32(
@@ -52,14 +44,12 @@ class RenderCallback(
                 )
                 )
                 installPixels(byteArray)
                 installPixels(byteArray)
             }.asComposeImageBitmap().apply {
             }.asComposeImageBitmap().apply {
-                Log.d("Image bitmap created with width: $width, height: $height, $this")
                 onImageRender(this)
                 onImageRender(this)
             }
             }
         }
         }
     }
     }
 
 
     override fun unlock(mediaPlayer: MediaPlayer?) {
     override fun unlock(mediaPlayer: MediaPlayer?) {
-        Log.d("Unlocked media player: ${mediaPlayer?.status()?.isPlaying}")
     }
     }
 
 
     fun allocateBuffers(byteArray: ByteArray) {
     fun allocateBuffers(byteArray: ByteArray) {

+ 0 - 1
composeApp/src/desktopMain/kotlin/org/mjdev/desktop/components/video/VideoPlayer.kt

@@ -13,7 +13,6 @@ import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer
 import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface
 import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface
 import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters
 import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters
 
 
-// todo performance
 @Composable
 @Composable
 actual fun VideoPlayer(
 actual fun VideoPlayer(
     mrl: String,
     mrl: String,