resolved conflicts for merge of 1edf1d80 to lmp-mr1-dev-plus-aosp

Change-Id: Id283ead449ea2779971c9caa07d0045798de30c1

5 files changed, 1 insertions, 25 deletions

diff --git a/videocodec/OMXVideoDecoderBase.h b/videocodec/OMXVideoDecoderBase.h
index 49610a7..48706b8 100644
--- a/videocodec/OMXVideoDecoderBase.h
+++ b/videocodec/OMXVideoDecoderBase.h
@@ -27,7 +27,7 @@
 #include "graphics.h"
 #endif
 
-static const char* VA_VED_RAW_MIME_TYPE = "video/x-raw-vaved";
+static constexpr const char* VA_VED_RAW_MIME_TYPE = "video/x-raw-vaved";
 static const uint32_t VA_VED_COLOR_FORMAT = 0x20;
 
 
diff --git a/videocodec/OMXVideoDecoderVP9HWR.cpp b/videocodec/OMXVideoDecoderVP9HWR.cpp
index 2170fd0..4482c37 100644
--- a/videocodec/OMXVideoDecoderVP9HWR.cpp
+++ b/videocodec/OMXVideoDecoderVP9HWR.cpp
@@ -88,8 +88,6 @@ OMXVideoDecoderVP9HWR::~OMXVideoDecoderVP9HWR()
 {
     LOGV("OMXVideoDecoderVP9HWR is destructed.");
 
-    unsigned int i = 0;
-
     if (mVADisplay) {
         vaTerminate(mVADisplay);
         mVADisplay = NULL;
@@ -401,7 +399,6 @@ OMX_ERRORTYPE OMXVideoDecoderVP9HWR::ProcessorProcess(
 {
     OMX_ERRORTYPE ret;
     OMX_BUFFERHEADERTYPE *inBuffer = *pBuffers[INPORT_INDEX];
-    OMX_BUFFERHEADERTYPE *outBuffer = *pBuffers[OUTPORT_INDEX];
     OMX_BOOL isResolutionChange = OMX_FALSE;
 
     if (inBuffer->pBuffer == NULL) {
@@ -593,11 +590,6 @@ OMX_ERRORTYPE OMXVideoDecoderVP9HWR::FillRenderBuffer(OMX_BUFFERHEADERTYPE **pBu
 
         void *dst = buffer->pBuffer;
         uint8_t *dst_y = (uint8_t *)dst;
-        const OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionInput
-                                      = this->ports[INPORT_INDEX]->GetPortDefinition();
-
-        size_t inBufferWidth = paramPortDefinitionInput->format.video.nFrameWidth;
-        size_t inBufferHeight = paramPortDefinitionInput->format.video.nFrameHeight;
 
         const OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionOutput
                                       = this->ports[OUTPORT_INDEX]->GetPortDefinition();
diff --git a/videocodec/OMXVideoDecoderVP9Hybrid.cpp b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
index 1246b7b..f0878c2 100644
--- a/videocodec/OMXVideoDecoderVP9Hybrid.cpp
+++ b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
@@ -197,7 +197,6 @@ OMX_ERRORTYPE OMXVideoDecoderVP9Hybrid::ProcessorFlush(OMX_U32 portIndex) {
 
 OMX_ERRORTYPE OMXVideoDecoderVP9Hybrid::ProcessorPreFillBuffer(OMX_BUFFERHEADERTYPE* buffer) {
     unsigned int handle = (unsigned int)buffer->pBuffer;
-    unsigned int i = 0;
 
     if (buffer->nOutputPortIndex == OUTPORT_INDEX){
         mSingalRenderDone(mHybridCtx,handle);
@@ -291,11 +290,6 @@ OMX_ERRORTYPE OMXVideoDecoderVP9Hybrid::ProcessorProcess(
     return ret;
 }
 
-static int ALIGN(int x, int y) {
-    // y must be a power of 2.
-    return (x + y - 1) & ~(y - 1);
-}
-
 OMX_ERRORTYPE OMXVideoDecoderVP9Hybrid::FillRenderBuffer(OMX_BUFFERHEADERTYPE **pBuffer,
                                                       buffer_retain_t *retain,
                                                       OMX_U32 inportBufferFlags,
diff --git a/videocodec/OMXVideoEncoderBase.cpp b/videocodec/OMXVideoEncoderBase.cpp
index 5e918c9..37f53d2 100644
--- a/videocodec/OMXVideoEncoderBase.cpp
+++ b/videocodec/OMXVideoEncoderBase.cpp
@@ -273,17 +273,13 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetVideoEncoderParam() {
 
     Encode_Status ret = ENCODE_SUCCESS;
     PortVideo *port_in = NULL;
-    PortVideo *port_out = NULL;
-    OMX_VIDEO_CONTROLRATETYPE controlrate;
     const OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionInput = NULL;
     LOGV("OMXVideoEncoderBase::SetVideoEncoderParam called\n");
 
     port_in = static_cast<PortVideo *>(ports[INPORT_INDEX]);
-    port_out = static_cast<PortVideo *>(ports[OUTPORT_INDEX]);
     paramPortDefinitionInput = port_in->GetPortDefinition();
     mEncoderParams->resolution.height = paramPortDefinitionInput->format.video.nFrameHeight;
     mEncoderParams->resolution.width = paramPortDefinitionInput->format.video.nFrameWidth;
-    const OMX_VIDEO_PARAM_BITRATETYPE *bitrate = port_out->GetPortBitrateParam();
 
     mEncoderParams->frameRate.frameRateDenom = 1;
     if(mConfigFramerate.xEncodeFramerate != 0) {
@@ -362,8 +358,6 @@ OMX_ERRORTYPE OMXVideoEncoderBase::ProcessorInit(void) {
 }
 
 OMX_ERRORTYPE OMXVideoEncoderBase::ProcessorDeinit(void) {
-    OMX_ERRORTYPE ret;
-
     if(mVideoEncoder) {
         mVideoEncoder->stop();
     }
@@ -813,8 +807,6 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetStoreMetaDataInBuffers(OMX_PTR pStructure)
     StoreMetaDataInBuffersParams *p = (StoreMetaDataInBuffersParams *)pStructure;
     VideoParamsStoreMetaDataInBuffers StoreMetaDataInBuffers;
     PortVideo *port = static_cast<PortVideo *>(this->ports[INPORT_INDEX]);
-    PortVideo *output_port = static_cast<PortVideo *>(this->ports[OUTPORT_INDEX]);
-    uint32_t maxSize = 0;
 
     CHECK_TYPE_HEADER(p);
     CHECK_PORT_INDEX(p, INPORT_INDEX);
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
index 1cee46c..101a34d 100755
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
@@ -147,8 +147,6 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ProcessorDeinit(void) {
 }
 
 OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ProcessorStart(void) {
-    uint32_t imrOffset = 0;
-    uint32_t dataBufferSize = DATA_BUFFER_SIZE;
 
     EnableIEDSession(true);
     uint32_t ret = drm_vendor_api.drm_start_playback();