Fix bug in decoding & color formats

Author: am3n

README.md

@@ -16,8 +16,8 @@ Unlike [AndroidX Media ExoPlayer](https://github.com/androidx/media) which also
 - Audio AAC LC only.
 - Basic/Digest authentication.
 - Supports majority of RTSP IP cameras.
-- Auto Decode raw frames to Media Image & YUV ByteArray & NV21 ByteArray & Bitmap.
-- Using [renderscript-intrinsics-replacement-toolkit](https://github.com/android/renderscript-intrinsics-replacement-toolkit) for NV21 to Bitmap decoding.
+- Auto Decode raw frames to Media Image & YUV ByteArray & Bitmap.
+- Using [renderscript-intrinsics-replacement-toolkit](https://github.com/android/renderscript-intrinsics-replacement-toolkit) for YUV to Bitmap decoding.
 
 ## Permissions
 
@@ -127,7 +127,7 @@ rtsp.setFrameListener(object : RtspFrameListener {
     override fun onVideoNalUnitReceived(frame: Frame?) {
         // Send raw H264 NAL unit to your custom decoder
     }
-    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, bitmap: Bitmap?) {}
+    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuvBytes: ByteArray?, bitmap: Bitmap?) {}
     override fun onAudioSampleReceived(frame: Frame?) {
         // Send raw audio to decoder
     }
@@ -148,7 +148,7 @@ You can still use library with H264 to YUV MediaImage decoding.
 // ... build rtsp
 rtsp.setFrameListener(object : RtspFrameListener {
     override fun onVideoNalUnitReceived(frame: Frame?) {}
-    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, bitmap: Bitmap?) { 
+    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuvBytes: ByteArray?, bitmap: Bitmap?) { 
         // Notice: you should use mediaImage object sync on this thread
     }
     override fun onAudioSampleReceived(frame: Frame?) {
@@ -166,14 +166,14 @@ rtsp.stop()
 
 ### 5) YUV byte array
 
-You can still use library with H264 to YUV420 ByteArray decoding.
+You can still use library with H264 to YUV ByteArray decoding.
 
 ```kotlin
 // ... build rtsp
 rtsp.setFrameListener(object : RtspFrameListener {
     override fun onVideoNalUnitReceived(frame: Frame?) {}
-    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, bitmap: Bitmap?) {
-        // you can decode YUV420 to Bitmap by your custom decoder
+    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuvBytes: ByteArray?, bitmap: Bitmap?) {
+        // you can decode YUV to Bitmap by your custom decoder
     }
     override fun onAudioSampleReceived(frame: Frame?) {
         // Send raw audio to decoder
@@ -188,39 +188,15 @@ rtsp.stop()
 
 ---
 
-### 6) NV21 byte array
-
-You can still use library with H264 to NV21 ByteArray decoding.
-
-```kotlin
-// ... build rtsp
-rtsp.setFrameListener(object : RtspFrameListener {
-    override fun onVideoNalUnitReceived(frame: Frame?) {}
-    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, bitmap: Bitmap?) {
-        // you can decode NV21 to Bitmap by your custom decoder
-    }
-    override fun onAudioSampleReceived(frame: Frame?) {
-        // Send raw audio to decoder
-    }
-})
-rtsp.setRequestAudioSample(true)
-rtsp.setRequestNv21Bytes(true)
-rtsp.start(playVideo = true, playAudio = true)
-// ...
-rtsp.stop()
-```
-
----
-
-### 7) Bitmap
+### 6) Bitmap
 
 You can still use library with H264 to Bitmap decoding.
 
 ```kotlin
 // ... build rtsp
 rtsp.setFrameListener(object : RtspFrameListener {
     override fun onVideoNalUnitReceived(frame: Frame?) {}
-    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, bitmap: Bitmap?) {
+    override fun onVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuvBytes: ByteArray?, bitmap: Bitmap?) {
         // Use the bitmap
     }
     override fun onAudioSampleReceived(frame: Frame?) {

app/src/main/java/ir/am3n/rtsp.client.demo/LiveFragment.kt

@@ -1,29 +1,28 @@
 package ir.am3n.rtsp.client.demo
 
 import android.annotation.SuppressLint
-import android.graphics.*
+import android.graphics.Bitmap
 import android.media.Image
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import ir.am3n.rtsp.client.Rtsp
-import ir.am3n.rtsp.client.interfaces.Frame
 import ir.am3n.rtsp.client.data.SdpInfo
 import ir.am3n.rtsp.client.demo.databinding.FragmentLiveBinding
+import ir.am3n.rtsp.client.interfaces.Frame
 import ir.am3n.rtsp.client.interfaces.RtspFrameListener
 import ir.am3n.rtsp.client.interfaces.RtspStatusListener
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.lang.Thread.sleep
-import kotlin.concurrent.thread
 
 @SuppressLint("SetTextI18n")
 class LiveFragment : Fragment() {
@@ -131,9 +130,9 @@ class LiveFragment : Fragment() {
 
         override fun onVideoFrameReceived(
             width: Int, height: Int, mediaImage: Image?,
-            yuv420Bytes: ByteArray?, nv21Bytes: ByteArray?, bitmap: Bitmap?
+            yuvBytes: ByteArray?, bitmap: Bitmap?
         ) {
-            Log.d(TAG, "onVideoFrameReceived()   img: $mediaImage   yuv: $yuv420Bytes   nv21: $nv21Bytes   bmp: $bitmap")
+            Log.d(TAG, "onVideoFrameReceived()   img: $mediaImage   yuv: $yuvBytes   bmp: $bitmap")
             binding.img.run {
                 post { setImageBitmap(bitmap) }
             }
@@ -181,14 +180,11 @@ class LiveFragment : Fragment() {
                 rtsp.stop()
             } else {
 
-                binding.rsv.init(liveViewModel.rtspRequest.value!!.toUri())
-                binding.rsv.start(playVideo = true, playAudio = true)
+                //binding.rsv.init(liveViewModel.rtspRequest.value!!.toUri())
+                //binding.rsv.start(playVideo = true, playAudio = true)
 
-                thread {
-                    sleep(2000)
-                    rtsp.init(liveViewModel.rtspRequest.value!!, timeout = 2_000)
-                    rtsp.start(playVideo = true, playAudio = true)
-                }
+                rtsp.init(liveViewModel.rtspRequest.value!!, timeout = 2_000)
+                rtsp.start(playVideo = true, playAudio = false)
 
             }
         }
@@ -198,11 +194,10 @@ class LiveFragment : Fragment() {
 
         rtsp.setSurfaceView(binding.svVideo)
 
-        //rtsp.setRequestMediaImage(true)
-        //rtsp.setRequestYuvBytes(true)
-        //rtsp.setRequestNv21Bytes(true)
-        //rtsp.setRequestBitmap(true)
-        //rtsp.setRequestAudioSample(true)
+        rtsp.setRequestMediaImage(true)
+        rtsp.setRequestYuvBytes(true)
+        rtsp.setRequestBitmap(true)
+        rtsp.setRequestAudioSample(true)
 
         return binding.root
     }
@@ -211,6 +206,7 @@ class LiveFragment : Fragment() {
         super.onResume()
         if (Rtsp.DEBUG) Log.v(TAG, "onResume()")
         liveViewModel.loadParams(requireContext())
+        binding.bnStartStop.performClick()
     }
 
     override fun onPause() {

rtsp-client/build.gradle

@@ -4,11 +4,14 @@ plugins {
 }
 
 android {
+
     namespace 'ir.am3n.rtsp.client'
-    compileSdkVersion 34
+
+    compileSdk 34
+
     defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 34
+        minSdk 23
+        targetSdk 34
         multiDexEnabled true
     }
 
@@ -27,5 +30,5 @@ dependencies {
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "com.google.android.exoplayer:exoplayer-core:2.18.3"
     implementation "androidx.media3:media3-exoplayer:1.4.1"
-    implementation 'com.github.am3n:renderscript-toolkit:'
+    api "com.github.am3n:renderscript-intrinsics-replacement-toolkit:1.0.0"
 }

rtsp-client/src/main/java/ir/am3n/rtsp/client/Rtsp.kt

@@ -74,7 +74,7 @@ class Rtsp {
                         }
                         override fun onVideoFrameReceived(
                             width: Int, height: Int, mediaImage: Image?,
-                            yuv420Bytes: ByteArray?, nv21Bytes: ByteArray?, bitmap: Bitmap?
+                            yuvBytes: ByteArray?, bitmap: Bitmap?
                         ) {}
                         override fun onAudioSampleReceived(frame: Frame?) {}
                     })
@@ -139,7 +139,6 @@ class Rtsp {
     private var playVideo = true
     private var requestMediaImage = false
     private var requestYuvBytes = false
-    private var requestNv21Bytes = false
     private var requestBitmap = false
 
     private var playAudio = true
@@ -226,8 +225,8 @@ class Rtsp {
             }
         }
 
-        override fun onRtspVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuv420Bytes: ByteArray?, nv21Bytes: ByteArray?, bitmap: Bitmap?) {
-            frameListener?.onVideoFrameReceived(width, height, mediaImage, yuv420Bytes, nv21Bytes, bitmap)
+        override fun onRtspVideoFrameReceived(width: Int, height: Int, mediaImage: Image?, yuvBytes: ByteArray?, bitmap: Bitmap?) {
+            frameListener?.onVideoFrameReceived(width, height, mediaImage, yuvBytes, bitmap)
         }
 
         override fun onRtspAudioSampleReceived(data: ByteArray, offset: Int, length: Int, timestamp: Long) {
@@ -347,11 +346,6 @@ class Rtsp {
         this.videoDecoder?.requestYuvBytes = requestYuvBytes
     }
 
-    fun setRequestNv21Bytes(requestNv21Bytes: Boolean) {
-        this.requestNv21Bytes = requestNv21Bytes
-        this.videoDecoder?.requestNv21Bytes = requestNv21Bytes
-    }
-
     fun setRequestBitmap(requestBitmap: Boolean) {
         this.requestBitmap = requestBitmap
         this.videoDecoder?.requestBitmap = requestBitmap
@@ -380,7 +374,7 @@ class Rtsp {
             surfaceView?.holder?.addCallback(surfaceCallback)
             videoDecoder?.stopAsync()
             videoDecoder = VideoDecoder(
-                surface = null, surfaceView, requestMediaImage, requestYuvBytes, requestNv21Bytes, requestBitmap,
+                surface = null, surfaceView, requestMediaImage, requestYuvBytes, requestBitmap,
                 videoMimeType, sdpInfo.videoTrack!!.frameWidth, sdpInfo.videoTrack!!.frameHeight, rotation = 0,
                 videoQueue, clientListener = clientListener
             )