From: CHANDRASHEKHAR S BYADGI Date: Tue, 10 Jan 2023 06:45:37 +0000 (+0530) Subject: Rtsp frames asynchronous decoding changes X-Git-Tag: accepted/tizen/unified/20230309.161434~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c2a664da616a24663186a752cbcb73bc8dd6b9c;p=platform%2Fcore%2Fml%2Faitt.git Rtsp frames asynchronous decoding changes --- diff --git a/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/H264Decoder.java b/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/H264Decoder.java index 75ff588..89d8a43 100644 --- a/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/H264Decoder.java +++ b/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/H264Decoder.java @@ -17,10 +17,14 @@ package com.samsung.android.modules.rtsp; import android.media.MediaCodec; import android.media.MediaFormat; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Process; import android.util.Log; +import androidx.annotation.NonNull; + import java.nio.ByteBuffer; -import java.util.concurrent.atomic.AtomicBoolean; /** * Class to implement H264 decoder functionalities @@ -31,22 +35,21 @@ public class H264Decoder { private ByteBuffer iFrame; private final int width; private final int height; - private final AtomicBoolean exitFlag; private final RTSPClient.ReceiveDataCallback streamCb; - private MediaCodec mCodec; - - // Async task that takes H264 frames and uses the decoder to update the Surface Texture - private DecodeFramesTask mFrameTask; + private Handler inputBufferHandler = null; + private Handler outputBufferHandler = null; + private HandlerThread inputBufferThread = null; + private HandlerThread outputBufferThread = null; /** * H264Decoder constructor * @param cb data callback to send data to application - * @param exitFlag flag to begin/terminate decoder execution + * @param height height of rtsp frames + * @param width width of rtsp frames */ - public H264Decoder(RTSPClient.ReceiveDataCallback cb, AtomicBoolean exitFlag, int height, int width) { + public H264Decoder(RTSPClient.ReceiveDataCallback cb, int height, int width) { streamCb = cb; - this.exitFlag = exitFlag; this.height = height; this.width = width; } @@ -57,7 +60,15 @@ public class H264Decoder { * @param pps Picture parameter set to set codec format */ public void initH264Decoder(byte[] sps, byte[] pps) { - //Create the format settings for the MediaCodec + // Create Input thread handler + inputBufferThread = new HandlerThread("inputBufferThread", Process.THREAD_PRIORITY_DEFAULT); + inputBufferThread.start(); + inputBufferHandler = new Handler(inputBufferThread.getLooper()); + // Create Output thread handler + outputBufferThread = new HandlerThread("outputBufferThread", Process.THREAD_PRIORITY_DEFAULT); + outputBufferThread.start(); + outputBufferHandler = new Handler(outputBufferThread.getLooper()); + // Create the format settings for the MediaCodec MediaFormat format = MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, width, height); // Set the SPS frame format.setByteBuffer("csd-0", ByteBuffer.wrap(sps)); @@ -69,16 +80,63 @@ public class H264Decoder { try { // Get an instance of MediaCodec and give it its Mime type mCodec = MediaCodec.createDecoderByType(MediaFormat.MIMETYPE_VIDEO_AVC); + // Set a callback for codec to receive input and output buffer free indexes + mCodec.setCallback(new MediaCodec.Callback() { + @Override + public void onInputBufferAvailable(@NonNull MediaCodec mediaCodec, int i) { + inputBufferHandler.post(() -> { + try { + ByteBuffer buffer = mCodec.getInputBuffer(i); + byte[] frame; + //TODO:Wait here till u get a frames, we can use lock/unlock here instead of loop ? + do { + frame = nextFrame(); + } while (frame == null); + buffer.put(frame); + clearFrame(); + // Inform decoder to process the frame + mCodec.queueInputBuffer(i, 0, frame.length, 0, 0); + } catch (Exception e) { + Log.e(TAG, "Failed to provide NAL units to decoder"); + } + }); + } + + @Override + public void onOutputBufferAvailable(@NonNull MediaCodec mediaCodec, int i, @NonNull MediaCodec.BufferInfo bufferInfo) { + outputBufferHandler.post(() -> { + try { + // Decoded frames are available in output buffer get it using index i + ByteBuffer outputBuffer = mCodec.getOutputBuffer(i); + byte[] arr = new byte[bufferInfo.size - bufferInfo.offset]; + outputBuffer.get(arr); + mCodec.releaseOutputBuffer(i, true); + if (arr.length != 0) { + Log.d(TAG, "Decoding of frame is completed"); + streamCb.pushData(arr); + } + } catch (Exception e) { + Log.e(TAG, "Failed to get decoded frames from decoder"); + } + }); + } + + @Override + public void onError(@NonNull MediaCodec mediaCodec, @NonNull MediaCodec.CodecException e) { + Log.e(TAG, "onError,please check codec error"); + } + + @Override + public void onOutputFormatChanged(@NonNull MediaCodec mediaCodec, @NonNull MediaFormat mediaFormat) { + Log.i(TAG, "onOutputFormatChanged,please handle this changed format"); + } + }); // Configure the codec mCodec.configure(format, null, null, 0); // Start the codec mCodec.start(); Log.d(TAG, "initH264Decoder done"); - // Create the AsyncTask to get the frames and decode them using the Codec - mFrameTask = new DecodeFramesTask(); - Thread thread = new Thread(mFrameTask); - thread.start(); - } catch (Exception e){ + } catch (Exception e) { Log.e(TAG, "Failed to initialize decoder"); } } @@ -129,78 +187,21 @@ public class H264Decoder { */ public void stopDecoder() { Log.d(TAG, "stopDecoders is invoked"); - exitFlag.set(true); try { + if (inputBufferThread != null) { + inputBufferThread.quit(); + inputBufferThread = null; + inputBufferHandler = null; + } + if (outputBufferThread != null) { + outputBufferThread.quit(); + outputBufferThread = null; + outputBufferHandler = null; + } mCodec.stop(); mCodec.release(); } catch (Exception e) { Log.e(TAG, "Failed to release decoder"); } } - - /** - * A task to decode frames on a different thread - */ - private class DecodeFramesTask implements Runnable { - - @Override - public void run() { - - while (!exitFlag.get()) { - byte[] frame = nextFrame(); - - if (frame == null || frame.length == 0) - continue; - - // clear iFrame to avoid redundant frame decoding - clearFrame(); - // Now we need to give it to the Codec to decode the frame - - // Get the input buffer from the decoder - // Pass in -1 here as in this example we don't have a playback time reference - int inputIndex = mCodec.dequeueInputBuffer(-1); - // If the buffer number is valid use the buffer with that index - if (inputIndex >= 0) { - ByteBuffer buffer = mCodec.getInputBuffer(inputIndex); - - try { - buffer.put(frame); - } catch(NullPointerException e) { - Log.e(TAG, "Failed to put frame to buffer"); - } - - // Tell the decoder to process the frame - mCodec.queueInputBuffer(inputIndex, 0, frame.length, 0, 0); - } - - // Stop decoder execution - if (exitFlag.get()) - break; - - MediaCodec.BufferInfo info = new MediaCodec.BufferInfo(); - int outputIndex = mCodec.dequeueOutputBuffer(info, 5000); - - if (outputIndex >= 0) { - ByteBuffer outputBuffer = mCodec.getOutputBuffer(outputIndex); - outputBuffer.position(info.offset); - outputBuffer.limit(info.offset + info.size); - byte[] arr = new byte[outputBuffer.remaining()]; - outputBuffer.get(arr); - - if(arr.length != 0) { - Log.d(TAG, "Decoding of frame is completed"); - streamCb.pushData(arr); - } - mCodec.releaseOutputBuffer(outputIndex, true); - } - - // wait for the next frame to be ready, the server/IP camera supports ~30fps - try { - Thread.sleep(33); - } catch (Exception e) { - Log.e(TAG, "Failed to put thread sleep"); - } - } - } - } } diff --git a/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/RTSPClient.java b/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/RTSPClient.java index c66a5ac..7bf67a0 100644 --- a/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/RTSPClient.java +++ b/android/modules/rtsp/src/main/java/com/samsung/android/modules/rtsp/RTSPClient.java @@ -34,16 +34,16 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class RTSPClient { private static final String TAG = "RTSPClient"; + private static volatile Socket clientSocket; + private static final int sdpInfoSize = 30; + private static final int socketTimeout = 10000; private String rtspUrl = null; private int height; private int width; - private static volatile Socket clientSocket; - private static int socketTimeout = 10000; - private AtomicBoolean exitFlag; + private final AtomicBoolean exitFlag; + private final ReceiveDataCallback streamCb; private RtspClient mRtspClient; - private ReceiveDataCallback streamCb; private H264Decoder decoder; - private int sdpInfoSize = 30; private byte[] sps; private byte[] pps; @@ -83,17 +83,14 @@ public class RTSPClient { Uri uri = Uri.parse(rtspUrl); try { - Thread thread = new Thread(new Runnable() { - @Override - public void run() { - try { - clientSocket = NetUtils.createSocketAndConnect(uri.getHost(), uri.getPort(), socketTimeout); - if(clientSocket != null) - socketCB.socketConnect(true); - } catch (Exception e) { - socketCB.socketConnect(false); - Log.d(TAG, "Exception in RTSP client socket creation"); - } + Thread thread = new Thread(() -> { + try { + clientSocket = NetUtils.createSocketAndConnect(uri.getHost(), uri.getPort(), socketTimeout); + if(clientSocket != null) + socketCB.socketConnect(true); + } catch (Exception e) { + socketCB.socketConnect(false); + Log.d(TAG, "Exception in RTSP client socket creation"); } }); @@ -109,7 +106,7 @@ public class RTSPClient { */ public void initRtspClient() { - RtspClient.RtspClientListener clientlistener = new RtspClient.RtspClientListener() { + RtspClient.RtspClientListener clientListener = new RtspClient.RtspClientListener() { @Override public void onRtspConnecting() { Log.d(TAG, "Connecting to RTSP server"); @@ -158,8 +155,8 @@ public class RTSPClient { Uri uri = Uri.parse(rtspUrl); - decoder = new H264Decoder(streamCb, exitFlag, height, width); - mRtspClient = new RtspClient.Builder(clientSocket, uri.toString(), exitFlag, clientlistener) + decoder = new H264Decoder(streamCb, height, width); + mRtspClient = new RtspClient.Builder(clientSocket, uri.toString(), exitFlag, clientListener) .requestAudio(false) .requestVideo(true) .withDebug(true)