From 7f0053c8f0cd76ecff7f8aee060cd4fd5093b1a3 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 18 八月 2017 11:07:16 +0800 Subject: [PATCH] bug fix for rtsp client --- RtspFace/PL_AndroidMediaCodecDecoder.h | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/RtspFace/PL_AndroidMediaCodecDecoder.h b/RtspFace/PL_AndroidMediaCodecDecoder.h index 98ef7ee..2d5f979 100644 --- a/RtspFace/PL_AndroidMediaCodecDecoder.h +++ b/RtspFace/PL_AndroidMediaCodecDecoder.h @@ -30,15 +30,32 @@ // AMEDIAFORMAT_KEY_SAMPLE_RATE; uint32_t ak_width; // AMEDIAFORMAT_KEY_WIDTH; // AMEDIAFORMAT_KEY_STRIDE; - - void* windowSurface; - + + void* windowSurfaceDecode; + void* windowSurfaceRender; + + bool releaseOutputBuffIdx; + bool releaseOutputBuffIdxInPay; + int generateDecodedDataPerFrame; // 0: do not generate, N: generate every N frame ((G . . .)/N ... (G . . .)/N ...) + + bool ptsUseAbsoluteTime; + + bool initCodecInPay; + PL_AndroidMediaCodecDecoder_Config() : ak_height(0), ak_mime(), ak_width(0), - windowSurface(nullptr) + windowSurfaceDecode(nullptr), + windowSurfaceRender(nullptr), + + releaseOutputBuffIdx(true), + releaseOutputBuffIdxInPay(false), + generateDecodedDataPerFrame(0), + ptsUseAbsoluteTime(false), + + initCodecInPay(true) {} }; @@ -56,8 +73,13 @@ private: void* internal; + + void aux_is_set(); + bool init_codec(); }; PipeLineElem* create_PL_AndroidMediaCodecDecoder(); +void dbgReadTexture(); + #endif -- Gitblit v1.8.0