From 3ee0cc149c46154d3a5318d1c6cbe861d65c389d Mon Sep 17 00:00:00 2001 From: Suneel Kandru Date: Thu, 27 Mar 2014 11:31:42 -0700 Subject: WIDEVINE: Increased the buffer size and fix the Klocwork issues BZ: 182607 Increased the buffer size in OMX and liboemcrypto modules Fixed the klocwork issue by initializing the ret value Change-Id: I71f3087eda8f8cd0963adb7f33fa801f42d9c2ff Signed-off-by: Suneel Kandru --- .../merrifield/OMXVideoDecoderAVCSecure.cpp | 19 +++++++++++-------- .../securevideo/merrifield/OMXVideoDecoderAVCSecure.h | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'videocodec') diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp index c391e42..e271b20 100755 --- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp @@ -226,15 +226,10 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareConfigBuffer(VideoConfigBuffer *p } OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareClassicWVDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p){ - OMX_ERRORTYPE ret; - // OMX_BUFFERFLAG_CODECCONFIG is an optional flag - // if flag is set, buffer will only contain codec data. + OMX_ERRORTYPE ret = OMX_ErrorNone; + - if (buffer->nFlags & OMX_BUFFERFLAG_CODECCONFIG) { - LOGV("Received AVC codec data."); - return ret; - } p->flag |= HAS_COMPLETE_FRAME; if (buffer->nOffset != 0) { @@ -333,8 +328,16 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE } DataBuffer *dataBuffer = (DataBuffer *)buffer->pBuffer; - if(dataBuffer->drmScheme == DRM_SCHEME_WV_CLASSIC) + if(dataBuffer->drmScheme == DRM_SCHEME_WV_CLASSIC){ + + // OMX_BUFFERFLAG_CODECCONFIG is an optional flag + // if flag is set, buffer will only contain codec data. + if (buffer->nFlags & OMX_BUFFERFLAG_CODECCONFIG) { + LOGV("Received AVC codec data."); + return ret; + } return PrepareClassicWVDecodeBuffer(buffer, retain, p); + } else if(dataBuffer->drmScheme == DRM_SCHEME_WV_MODULAR) return PrepareModularWVDecodeBuffer(buffer, retain, p); return ret; diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h index 0d8d028..497db0f 100755 --- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h +++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h @@ -62,7 +62,7 @@ private: // OMX_PARAM_PORTDEFINITIONTYPE INPORT_MIN_BUFFER_COUNT = 1, INPORT_ACTUAL_BUFFER_COUNT = 5, - INPORT_BUFFER_SIZE = 1382400, + INPORT_BUFFER_SIZE = 1572864, // for OMX_VIDEO_PARAM_INTEL_AVC_DECODE_SETTINGS // default number of reference frame -- cgit v1.2.3