add buffer to buffer support in BufferDecoder

Author: pedroSG94

extra-sources/src/main/java/com/pedro/extrasources/BufferDecoder.kt

@@ -5,16 +5,25 @@ import android.media.MediaCodec.BufferInfo
 import android.media.MediaFormat
 import android.view.Surface
 import com.pedro.common.TimeUtils
+import com.pedro.common.VideoCodec
+import com.pedro.common.clone
 import com.pedro.encoder.utils.CodecUtil
+import java.nio.ByteBuffer
 
-class BufferDecoder {
+class BufferDecoder(videoCodec: VideoCodec) {
 
     private var codec: MediaCodec? = null
     private var mediaFormat: MediaFormat? = null
     private var startTs = 0L
     private val bufferInfo = BufferInfo()
+    private val mime = when (videoCodec){
+        VideoCodec.H264 -> CodecUtil.H264_MIME
+        VideoCodec.H265 -> CodecUtil.H265_MIME
+        VideoCodec.AV1 -> CodecUtil.AV1_MIME
+    }
+    private var isSurfaceMode = false
 
-    fun prepare(width: Int, height: Int, fps: Int, rotation: Int, mime: String) {
+    fun prepare(width: Int, height: Int, fps: Int, rotation: Int) {
         val mediaFormat = MediaFormat()
         if (rotation == 0 || rotation == 180) {
             mediaFormat.setInteger(MediaFormat.KEY_WIDTH, width)
@@ -28,13 +37,22 @@ class BufferDecoder {
         this.mediaFormat = mediaFormat
     }
 
-    fun start(surface: Surface) {
+    /**
+     * @return output raw color. Value indicated in MediaCodecInfo.CodecCapabilities. -1 if not found
+     */
+    fun start(surface: Surface?): Int {
+        isSurfaceMode = surface != null
         mediaFormat?.let {
             startTs = TimeUtils.getCurrentTimeMicro()
-            codec = MediaCodec.createDecoderByType(CodecUtil.H264_MIME)
+            codec = MediaCodec.createDecoderByType(mime)
             codec?.configure(mediaFormat, surface, null, 0)
+            val color = try {
+                codec?.outputFormat?.getInteger(MediaFormat.KEY_COLOR_FORMAT) ?: -1
+            } catch (e: Exception) { -1 }
             codec?.start()
+            return color
         }
+        return -1
     }
 
     fun stop() {
@@ -46,10 +64,14 @@ class BufferDecoder {
             codec = null
             mediaFormat = null
             startTs = 0
+            isSurfaceMode = false
         }
     }
 
-    fun decode(data: ByteArray) {
+    /**
+     * @return The frame data in raw format indicated in start method. return null if fail or in surface mode
+     */
+    fun decode(data: ByteArray): ByteBuffer? {
         codec?.let {
             val inIndex = it.dequeueInputBuffer(10000)
             if (inIndex >= 0) {
@@ -59,8 +81,11 @@ class BufferDecoder {
             }
             val outIndex = it.dequeueOutputBuffer(bufferInfo, 10000)
             if (outIndex >= 0) {
-                it.releaseOutputBuffer(outIndex, true)
+                val rawData = if (!isSurfaceMode) it.getOutputBuffer(outIndex)?.clone() else null
+                it.releaseOutputBuffer(outIndex, isSurfaceMode)
+                return rawData
             }
         }
+        return null
     }
 }

extra-sources/src/main/java/com/pedro/extrasources/BufferVideoSource.kt

@@ -5,10 +5,10 @@ import android.media.MediaCodec
 import android.media.MediaFormat
 import android.view.Surface
 import com.pedro.common.TimeUtils
+import com.pedro.common.VideoCodec
 import com.pedro.common.toByteArray
 import com.pedro.encoder.Frame
 import com.pedro.encoder.input.sources.video.VideoSource
-import com.pedro.encoder.utils.CodecUtil
 import com.pedro.encoder.utils.yuv.NV21Utils
 import com.pedro.encoder.utils.yuv.YUVUtil
 import com.pedro.encoder.video.FormatVideoEncoder
@@ -41,7 +41,11 @@ class BufferVideoSource(
 
         override fun onVideoFormat(mediaFormat: MediaFormat) { }
     })
-    private val decoder = BufferDecoder()
+    private val decoder = BufferDecoder(when (format) {
+        Format.H265 -> VideoCodec.H265
+        Format.AV1 -> VideoCodec.AV1
+        else -> VideoCodec.H264
+    })
     private var scope = CoroutineScope(Dispatchers.IO)
     private val queue: BlockingQueue<Frame> = ArrayBlockingQueue(80)
 
@@ -76,13 +80,8 @@ class BufferVideoSource(
     }
 
     override fun create(width: Int, height: Int, fps: Int, rotation: Int): Boolean {
-        val mime = when (format) {
-            Format.H265 -> CodecUtil.H265_MIME
-            Format.AV1 -> CodecUtil.AV1_MIME
-            else -> CodecUtil.H264_MIME
-        }
         val result = videoEncoder.prepareVideoEncoder(width, height, fps, bitrate, rotation, 2, FormatVideoEncoder.YUV420Dynamical)
-        decoder.prepare(width, height, fps, rotation, mime)
+        decoder.prepare(width, height, fps, rotation)
         NV21Utils.preAllocateBuffers(width * height * 3 / 2)
         return result
     }