remove warning in omx-component

BZ: 209178

remove warning in omx-component except the warning caused by
AOSP header file OMX_VideoExt.h

Change-Id: Iacef8ca69281fa1f489f4a3dbdc949cef54978d7
Signed-off-by: ywan171 <yi.a.wang@intel.com>
Reviewed-on: https://android.intel.com/220523
Reviewed-by: Fourdan, Olivier <olivier.fourdan@intel.com>
Tested-by: Fourdan, Olivier <olivier.fourdan@intel.com>

24 files changed, 111 insertions, 115 deletions

diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index 937f392..43dea22 100644
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -42,7 +42,7 @@ LOCAL_SRC_FILES := \
     OMXComponentCodecBase.cpp\
     OMXVideoDecoderBase.cpp\
     OMXVideoDecoderAVC.cpp
-
+LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderAVC
 ifeq ($(TARGET_BOARD_PLATFORM),clovertrail)
@@ -105,7 +105,6 @@ LOCAL_SRC_FILES := \
     OMXComponentCodecBase.cpp\
     OMXVideoDecoderBase.cpp\
     OMXVideoDecoderVP8.cpp
-
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderVP8
 
@@ -171,7 +170,7 @@ LOCAL_SRC_FILES := \
     OMXComponentCodecBase.cpp\
     OMXVideoDecoderBase.cpp\
     OMXVideoDecoderMPEG4.cpp
-
+LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderMPEG4
 ifeq ($(TARGET_BOARD_PLATFORM),clovertrail)
@@ -227,7 +226,7 @@ LOCAL_SRC_FILES := \
     OMXComponentCodecBase.cpp\
     OMXVideoDecoderBase.cpp\
     OMXVideoDecoderH263.cpp
-
+LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderH263
 ifeq ($(TARGET_BOARD_PLATFORM),clovertrail)
@@ -283,7 +282,7 @@ LOCAL_SRC_FILES := \
     OMXComponentCodecBase.cpp\
     OMXVideoDecoderBase.cpp\
     OMXVideoDecoderWMV.cpp
-
+LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderWMV
 ifeq ($(TARGET_BOARD_PLATFORM),clovertrail)
@@ -393,7 +392,6 @@ LOCAL_SRC_FILES := \
     OMXVideoEncoderAVC.cpp
 
 LOCAL_CFLAGS += $(LOCAL_C_FLAGS)
-
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoEncoderAVC
 include $(BUILD_SHARED_LIBRARY)
@@ -436,7 +434,7 @@ LOCAL_CFLAGS += $(LOCAL_C_FLAGS)
 ifeq ($(SW_MPEG4_ENCODER),true)
     LOCAL_CFLAGS += -DSYNC_MODE
 endif
-
+LOCAL_CFLAGS += -Werror
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoEncoderH263
 include $(BUILD_SHARED_LIBRARY)
@@ -556,7 +554,6 @@ LOCAL_SRC_FILES := \
     OMXVideoEncoderVP8.cpp
 
 LOCAL_CFLAGS += $(LOCAL_C_FLAGS)
-
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoEncoderVP8
 include $(BUILD_SHARED_LIBRARY)
diff --git a/videocodec/OMXComponentCodecBase.h b/videocodec/OMXComponentCodecBase.h
index cf87c41..79f43ac 100644
--- a/videocodec/OMXComponentCodecBase.h
+++ b/videocodec/OMXComponentCodecBase.h
@@ -22,7 +22,6 @@
 #include <OMX_Core.h>
 #include <OMX_Component.h>
 #include <OMX_IndexExt.h>
-#include <OMX_VideoExt.h>
 #include <OMX_IntelErrorTypes.h>
 
 #include <portbase.h>
diff --git a/videocodec/OMXComponentDefines.h b/videocodec/OMXComponentDefines.h
index e697d45..02c45e4 100644
--- a/videocodec/OMXComponentDefines.h
+++ b/videocodec/OMXComponentDefines.h
@@ -38,7 +38,7 @@
 
 #define CHECK_PORT_INDEX(P, INDEX)\
     if ((P)->nPortIndex != INDEX) {\
-        LOGE("Bad port index %lu, expected: %d", (P)->nPortIndex, INDEX);\
+        LOGE("Bad port index %u, expected: %d", (P)->nPortIndex, INDEX);\
         return OMX_ErrorBadPortIndex;\
     }
 
@@ -50,7 +50,7 @@
 
 #define CHECK_PORT_INDEX_RANGE(P)\
     if ((P)->nPortIndex != 0 && (P)->nPortIndex != 1) {\
-        LOGE("Port out of range %lu", (P)->nPortIndex);\
+        LOGE("Port out of range %u", (P)->nPortIndex);\
         return OMX_ErrorBadPortIndex;\
     }
 
diff --git a/videocodec/OMXVideoDecoderAVC.cpp b/videocodec/OMXVideoDecoderAVC.cpp
index 09a01ee..87b74a4 100644
--- a/videocodec/OMXVideoDecoderAVC.cpp
+++ b/videocodec/OMXVideoDecoderAVC.cpp
@@ -258,7 +258,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVC::SetParamVideoAvc(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderAVC::GetParamIntelAVCDecodeSettings(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderAVC::GetParamIntelAVCDecodeSettings(OMX_PTR) {
     return OMX_ErrorNotImplemented;
 }
 
@@ -276,7 +276,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVC::SetParamIntelAVCDecodeSettings(OMX_PTR pStruct
         // TODO: check if we just return in this case.
         p->nMaxNumberOfReferenceFrame = NUM_REFERENCE_FRAME;
     }
-    LOGI("Maximum width = %lu, height = %lu, dpb = %lu", p->nMaxWidth, p->nMaxHeight, p->nMaxNumberOfReferenceFrame);
+    LOGI("Maximum width = %u, height = %u, dpb = %u", p->nMaxWidth, p->nMaxHeight, p->nMaxNumberOfReferenceFrame);
     mDecodeSettings = *p;
 
     return OMX_ErrorNone;
@@ -306,17 +306,17 @@ OMX_ERRORTYPE OMXVideoDecoderAVC::GetParamVideoAVCProfileLevel(OMX_PTR pStructur
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderAVC::SetParamVideoAVCProfileLevel(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderAVC::SetParamVideoAVCProfileLevel(OMX_PTR) {
     LOGW("SetParamVideoAVCProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderAVC::GetOutputColorFormat(int width, int height)
+OMX_COLOR_FORMATTYPE OMXVideoDecoderAVC::GetOutputColorFormat(int width)
 {
 #ifdef USE_GEN_HW
     return OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar_Tiled;
 #else
-    return OMXVideoDecoderBase::GetOutputColorFormat(width, height);
+    return OMXVideoDecoderBase::GetOutputColorFormat(width);
 #endif
 }
 
diff --git a/videocodec/OMXVideoDecoderAVC.h b/videocodec/OMXVideoDecoderAVC.h
index 74195a4..0545939 100644
--- a/videocodec/OMXVideoDecoderAVC.h
+++ b/videocodec/OMXVideoDecoderAVC.h
@@ -40,7 +40,7 @@ protected:
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
    virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
-   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
    DECLARE_HANDLER(OMXVideoDecoderAVC, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVC, ParamIntelAVCDecodeSettings);
    DECLARE_HANDLER(OMXVideoDecoderAVC, ParamVideoAVCProfileLevel);
diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp
index c3756a0..2f08f60 100644
--- a/videocodec/OMXVideoDecoderBase.cpp
+++ b/videocodec/OMXVideoDecoderBase.cpp
@@ -24,10 +24,10 @@ static const char* VA_RAW_MIME_TYPE = "video/x-raw-va";
 static const uint32_t VA_COLOR_FORMAT = 0x7FA00E00;
 
 OMXVideoDecoderBase::OMXVideoDecoderBase()
-    : mVideoDecoder(NULL),
-      mNativeBufferCount(OUTPORT_NATIVE_BUFFER_COUNT),
-      mOMXBufferHeaderTypePtrNum(0),
+     : mOMXBufferHeaderTypePtrNum(0),
       mRotationDegrees(0),
+      mVideoDecoder(NULL),
+      mNativeBufferCount(OUTPORT_NATIVE_BUFFER_COUNT),
 #ifdef TARGET_HAS_VPP
       mVppBufferNum(0),
 #endif
@@ -167,7 +167,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::InitOutputPort(void) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::InitOutputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionOutput) {
+OMX_ERRORTYPE OMXVideoDecoderBase::InitOutputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *) {
     // no format specific to initialize output port
     return OMX_ErrorNone;
 }
@@ -256,7 +256,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorResume(void) {
 }
 
 OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorFlush(OMX_U32 portIndex) {
-    LOGI("Flushing port# %lu.", portIndex);
+    LOGI("Flushing port# %u.", portIndex);
     if (mVideoDecoder == NULL) {
         LOGE("ProcessorFlush: Video decoder is not created.");
         return OMX_ErrorDynamicResourcesUnavailable;
@@ -310,7 +310,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorPreFreeBuffer(OMX_U32 nPortIndex, OM
 OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorProcess(
     OMX_BUFFERHEADERTYPE ***pBuffers,
     buffer_retain_t *retains,
-    OMX_U32 numberBuffers) {
+    OMX_U32) {
 
     OMX_ERRORTYPE ret;
     Decode_Status status;
@@ -442,7 +442,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::PrepareConfigBuffer(VideoConfigBuffer *p) {
 
     if (mWorkingMode == GRAPHICBUFFER_MODE) {
         p->surfaceNumber = mOMXBufferHeaderTypePtrNum;
-        for (int i = 0; i < mOMXBufferHeaderTypePtrNum; i++){
+        for (uint32_t i = 0; i < mOMXBufferHeaderTypePtrNum; i++){
             OMX_BUFFERHEADERTYPE *buffer_hdr = mOMXBufferHeaderTypePtrArray[i];
             p->graphicBufferHandler[i] = buffer_hdr->pBuffer;
             LOGV("PrepareConfigBuffer bufferid = %p, handle = %p", buffer_hdr, buffer_hdr->pBuffer);
@@ -622,15 +622,15 @@ OMX_ERRORTYPE OMXVideoDecoderBase::HandleFormatChange(void) {
         this->ports[OUTPORT_INDEX]->GetPortDefinition(),
         sizeof(paramPortDefinitionOutput));
 
-    int width = formatInfo->width;
-    int height = formatInfo->height;
-    int stride = formatInfo->width;
-    int sliceHeight = formatInfo->height;
+    uint32_t width = formatInfo->width;
+    uint32_t height = formatInfo->height;
+    uint32_t stride = formatInfo->width;
+    uint32_t sliceHeight = formatInfo->height;
 
-    int widthCropped = formatInfo->width - formatInfo->cropLeft - formatInfo->cropRight;
-    int heightCropped = formatInfo->height - formatInfo->cropTop - formatInfo->cropBottom;
-    int strideCropped = widthCropped;
-    int sliceHeightCropped = heightCropped;
+    uint32_t widthCropped = formatInfo->width - formatInfo->cropLeft - formatInfo->cropRight;
+    uint32_t heightCropped = formatInfo->height - formatInfo->cropTop - formatInfo->cropBottom;
+    uint32_t strideCropped = widthCropped;
+    uint32_t sliceHeightCropped = heightCropped;
     int force_realloc = 0;
 
 #ifdef TARGET_HAS_VPP
@@ -649,7 +649,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::HandleFormatChange(void) {
         }
     }
 
-    LOGV("Original size = %lu x %lu, new size = %d x %d, cropped size = %d x %d",
+    LOGV("Original size = %u x %u, new size = %d x %d, cropped size = %d x %d",
         paramPortDefinitionInput.format.video.nFrameWidth,
         paramPortDefinitionInput.format.video.nFrameHeight,
         width, height, widthCropped, heightCropped);
@@ -688,8 +688,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::HandleFormatChange(void) {
             paramPortDefinitionOutput.format.video.nFrameWidth = width;
             paramPortDefinitionOutput.format.video.nFrameHeight = (height + 0x1f) & ~0x1f;
             paramPortDefinitionOutput.format.video.eColorFormat = GetOutputColorFormat(
-                    paramPortDefinitionOutput.format.video.nFrameWidth,
-                    paramPortDefinitionOutput.format.video.nFrameHeight);
+                    paramPortDefinitionOutput.format.video.nFrameWidth);
             paramPortDefinitionOutput.format.video.nStride = stride;
             paramPortDefinitionOutput.format.video.nSliceHeight = sliceHeight;
        }
@@ -808,12 +807,12 @@ OMX_ERRORTYPE OMXVideoDecoderBase::GetNativeBufferUsage(OMX_PTR pStructure) {
      param->nUsage |= GRALLOC_USAGE_HW_TEXTURE;
      return OMX_ErrorNone;
 }
-OMX_ERRORTYPE OMXVideoDecoderBase::SetNativeBufferUsage(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::SetNativeBufferUsage(OMX_PTR) {
     CHECK_SET_PARAM_STATE();
     return OMX_ErrorBadParameter;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::GetNativeBuffer(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::GetNativeBuffer(OMX_PTR) {
     return OMX_ErrorBadParameter;
 }
 
@@ -848,7 +847,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::SetNativeBuffer(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::GetNativeBufferMode(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::GetNativeBufferMode(OMX_PTR) {
     LOGE("GetNativeBufferMode is not implemented");
     return OMX_ErrorNotImplemented;
 }
@@ -880,14 +879,13 @@ OMX_ERRORTYPE OMXVideoDecoderBase::SetNativeBufferMode(OMX_PTR pStructure) {
     port_def.format.video.eColorFormat = OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar;
     port_def.format.video.nFrameHeight = (port_def.format.video.nFrameHeight + 0x1f) & ~0x1f;
     port_def.format.video.eColorFormat = GetOutputColorFormat(
-                        port_def.format.video.nFrameWidth,
-                        port_def.format.video.nFrameHeight);
+                        port_def.format.video.nFrameWidth);
     port->SetPortDefinition(&port_def,true);
 
      return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::GetDecoderRotation(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::GetDecoderRotation(OMX_PTR) {
     return OMX_ErrorBadParameter;
 }
 OMX_ERRORTYPE OMXVideoDecoderBase::SetDecoderRotation(OMX_PTR pStructure) {
@@ -941,11 +939,11 @@ OMX_ERRORTYPE OMXVideoDecoderBase::GetDecoderOutputCrop(OMX_PTR pStructure) {
     }
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::SetDecoderOutputCrop(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::SetDecoderOutputCrop(OMX_PTR) {
     return OMX_ErrorUnsupportedSetting;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::GetErrorReportMode(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderBase::GetErrorReportMode(OMX_PTR) {
     LOGE("GetErrorReportMode is not implemented");
     return OMX_ErrorNotImplemented;
 }
@@ -964,7 +962,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::SetErrorReportMode(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderBase::GetOutputColorFormat(int width, int height) {
+OMX_COLOR_FORMATTYPE OMXVideoDecoderBase::GetOutputColorFormat(int width) {
 #ifndef VED_TILING
     return OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar;
 #else
@@ -977,6 +975,6 @@ OMX_COLOR_FORMATTYPE OMXVideoDecoderBase::GetOutputColorFormat(int width, int he
 #endif
 }
 
-OMX_ERRORTYPE OMXVideoDecoderBase::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+OMX_ERRORTYPE OMXVideoDecoderBase::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *) {
     return OMX_ErrorNone;
 }
diff --git a/videocodec/OMXVideoDecoderBase.h b/videocodec/OMXVideoDecoderBase.h
index 9ab7119..784735d 100644
--- a/videocodec/OMXVideoDecoderBase.h
+++ b/videocodec/OMXVideoDecoderBase.h
@@ -64,7 +64,7 @@ protected:
                               OMX_U32 inportBufferFlags,  OMX_BOOL *isResolutionChange);
     virtual OMX_ERRORTYPE HandleFormatChange(void);
     virtual OMX_ERRORTYPE TranslateDecodeStatus(Decode_Status status);
-    virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+    virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
     virtual OMX_ERRORTYPE BuildHandlerList(void);
     DECLARE_HANDLER(OMXVideoDecoderBase, ParamVideoPortFormat);
     DECLARE_HANDLER(OMXVideoDecoderBase, CapabilityFlags);
diff --git a/videocodec/OMXVideoDecoderH263.cpp b/videocodec/OMXVideoDecoderH263.cpp
index 7cec2ef..86c8336 100644
--- a/videocodec/OMXVideoDecoderH263.cpp
+++ b/videocodec/OMXVideoDecoderH263.cpp
@@ -131,17 +131,17 @@ OMX_ERRORTYPE OMXVideoDecoderH263::GetParamVideoH263ProfileLevel(OMX_PTR pStruct
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderH263::SetParamVideoH263ProfileLevel(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderH263::SetParamVideoH263ProfileLevel(OMX_PTR) {
     LOGW("SetParamVideoH263ProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderH263::GetOutputColorFormat(int width, int height)
+OMX_COLOR_FORMATTYPE OMXVideoDecoderH263::GetOutputColorFormat(int width)
 {
 #ifdef USE_GEN_HW
     return (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL;
 #else
-    return OMXVideoDecoderBase::GetOutputColorFormat(width, height);
+    return OMXVideoDecoderBase::GetOutputColorFormat(width);
 #endif
 }
 
diff --git a/videocodec/OMXVideoDecoderH263.h b/videocodec/OMXVideoDecoderH263.h
index 9da8fef..dd2a066 100644
--- a/videocodec/OMXVideoDecoderH263.h
+++ b/videocodec/OMXVideoDecoderH263.h
@@ -40,7 +40,7 @@ protected:
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
    virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
-   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
    DECLARE_HANDLER(OMXVideoDecoderH263, ParamVideoH263);
    DECLARE_HANDLER(OMXVideoDecoderH263, ParamVideoH263ProfileLevel);
 
diff --git a/videocodec/OMXVideoDecoderMPEG4.cpp b/videocodec/OMXVideoDecoderMPEG4.cpp
index 818800f..96e54ee 100644
--- a/videocodec/OMXVideoDecoderMPEG4.cpp
+++ b/videocodec/OMXVideoDecoderMPEG4.cpp
@@ -132,17 +132,17 @@ OMX_ERRORTYPE OMXVideoDecoderMPEG4::GetParamVideoMpeg4ProfileLevel(OMX_PTR pStru
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderMPEG4::SetParamVideoMpeg4ProfileLevel(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderMPEG4::SetParamVideoMpeg4ProfileLevel(OMX_PTR) {
     LOGW("SetParamVideoMpeg4ProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderMPEG4::GetOutputColorFormat(int width, int height)
+OMX_COLOR_FORMATTYPE OMXVideoDecoderMPEG4::GetOutputColorFormat(int width)
 {
 #ifdef USE_GEN_HW
     return (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL;
 #else
-    return OMXVideoDecoderBase::GetOutputColorFormat(width, height);
+    return OMXVideoDecoderBase::GetOutputColorFormat(width);
 #endif
 }
 
diff --git a/videocodec/OMXVideoDecoderMPEG4.h b/videocodec/OMXVideoDecoderMPEG4.h
index fcf2425..4b1bf77 100644
--- a/videocodec/OMXVideoDecoderMPEG4.h
+++ b/videocodec/OMXVideoDecoderMPEG4.h
@@ -41,7 +41,7 @@ protected:
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
    virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
-   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
    DECLARE_HANDLER(OMXVideoDecoderMPEG4, ParamVideoMpeg4);
    DECLARE_HANDLER(OMXVideoDecoderMPEG4, ParamVideoMpeg4ProfileLevel);
 
diff --git a/videocodec/OMXVideoDecoderPAVC.cpp b/videocodec/OMXVideoDecoderPAVC.cpp
index 69584d0..5f78425 100644
--- a/videocodec/OMXVideoDecoderPAVC.cpp
+++ b/videocodec/OMXVideoDecoderPAVC.cpp
@@ -161,7 +161,7 @@ OMX_ERRORTYPE OMXVideoDecoderPAVC::GetVideoProfileLevelQuerySupported(OMX_PTR pS
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoDecoderPAVC::SetVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoDecoderPAVC::SetVideoProfileLevelQuerySupported(OMX_PTR) {
     LOGE("SetVideoProfileLevelQuerySupported is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
diff --git a/videocodec/OMXVideoDecoderVP8.cpp b/videocodec/OMXVideoDecoderVP8.cpp
index 80fd5ac..013bf8b 100644
--- a/videocodec/OMXVideoDecoderVP8.cpp
+++ b/videocodec/OMXVideoDecoderVP8.cpp
@@ -19,7 +19,6 @@
 #define LOG_TAG "OMXVideoDecoder"
 #include <wrs_omxil_core/log.h>
 #include "OMXVideoDecoderVP8.h"
-
 // Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
 static const char* VP8_MIME_TYPE = "video/x-vnd.on2.vp8";
 
@@ -108,7 +107,7 @@ OMX_ERRORTYPE OMXVideoDecoderVP8::SetParamVideoVp8(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderVP8::GetOutputColorFormat(int width, int height)
+OMX_COLOR_FORMATTYPE OMXVideoDecoderVP8::GetOutputColorFormat(int width)
 {
 #ifdef USE_GEN_HW
 #ifdef USE_X_TILE
@@ -117,7 +116,7 @@ OMX_COLOR_FORMATTYPE OMXVideoDecoderVP8::GetOutputColorFormat(int width, int hei
     return (OMX_COLOR_FORMATTYPE)OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar_Tiled;
 #endif
 #else
-    return OMXVideoDecoderBase::GetOutputColorFormat(width, height);
+    return OMXVideoDecoderBase::GetOutputColorFormat(width);
 #endif
 }
 
diff --git a/videocodec/OMXVideoDecoderVP8.h b/videocodec/OMXVideoDecoderVP8.h
index ffe5d7f..42faa6d 100644
--- a/videocodec/OMXVideoDecoderVP8.h
+++ b/videocodec/OMXVideoDecoderVP8.h
@@ -21,6 +21,7 @@
 
 
 #include "OMXVideoDecoderBase.h"
+#include <OMX_VideoExt.h>
 
 class OMXVideoDecoderVP8 : public OMXVideoDecoderBase {
 public:
@@ -41,7 +42,7 @@ protected:
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
    virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
-   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
    DECLARE_HANDLER(OMXVideoDecoderVP8, ParamVideoVp8);
 
 private:
diff --git a/videocodec/OMXVideoDecoderWMV.cpp b/videocodec/OMXVideoDecoderWMV.cpp
index 7db5f38..7e82d00 100644
--- a/videocodec/OMXVideoDecoderWMV.cpp
+++ b/videocodec/OMXVideoDecoderWMV.cpp
@@ -106,12 +106,12 @@ OMX_ERRORTYPE OMXVideoDecoderWMV::SetParamVideoWmv(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_COLOR_FORMATTYPE OMXVideoDecoderWMV::GetOutputColorFormat(int width, int height)
+OMX_COLOR_FORMATTYPE OMXVideoDecoderWMV::GetOutputColorFormat(int width)
 {
 #ifdef USE_GEN_HW
     return OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar_Tiled;
 #else
-    return OMXVideoDecoderBase::GetOutputColorFormat(width, height);
+    return OMXVideoDecoderBase::GetOutputColorFormat(width);
 #endif
 }
 
diff --git a/videocodec/OMXVideoDecoderWMV.h b/videocodec/OMXVideoDecoderWMV.h
index 4e1ea1c..bd5333f 100644
--- a/videocodec/OMXVideoDecoderWMV.h
+++ b/videocodec/OMXVideoDecoderWMV.h
@@ -41,7 +41,7 @@ protected:
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
    virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
-   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
+   virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width);
    DECLARE_HANDLER(OMXVideoDecoderWMV, ParamVideoWmv);
 
 private:
diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp
index cac4fcb..b9598e1 100644
--- a/videocodec/OMXVideoEncoderAVC.cpp
+++ b/videocodec/OMXVideoEncoderAVC.cpp
@@ -462,21 +462,22 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessDataRetrieve(
             outBuf.format = OUTPUT_ONE_NAL;
             break;
 
-        case OMX_NaluFormatStartCodesSeparateFirstHeader:
-        case OMX_NaluFormatLengthPrefixedSeparateFirstHeader:
-            if(!mCSDOutputted) {
-                LOGV("Output codec data for first frame\n");
-                outBuf.format = OUTPUT_CODEC_DATA;
+        default:
+            if (NaluFormat == (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader||
+                NaluFormat == (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader){
+                if(!mCSDOutputted) {
+                    LOGV("Output codec data for first frame\n");
+                    outBuf.format = OUTPUT_CODEC_DATA;
+                } else {
+                    if (NaluFormat == (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader)
+                        outBuf.format = OUTPUT_EVERYTHING;
+                    else
+                        outBuf.format = OUTPUT_NALULENGTHS_PREFIXED;
+                }
+                break;
             } else {
-                if (NaluFormat == OMX_NaluFormatStartCodesSeparateFirstHeader)
-                    outBuf.format = OUTPUT_EVERYTHING;
-                else
-                    outBuf.format = OUTPUT_NALULENGTHS_PREFIXED;
+                return OMX_ErrorUndefined;
             }
-            break;
-
-        default:
-            return OMX_ErrorUndefined;
     }
 
     //start getOutput
@@ -530,8 +531,8 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessDataRetrieve(
         LOGV("got a complete libmix Frame\n");
         outflags |= OMX_BUFFERFLAG_ENDOFFRAME;
 
-        if ((NaluFormat == OMX_NaluFormatStartCodesSeparateFirstHeader
-             || NaluFormat == OMX_NaluFormatLengthPrefixedSeparateFirstHeader )
+        if ((NaluFormat == (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader
+             || NaluFormat == (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader )
              && !mCSDOutputted && outfilledlen > 0) {
             mCSDOutputted = OMX_TRUE;
 
@@ -572,7 +573,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessDataRetrieve(
 OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessorProcess(
     OMX_BUFFERHEADERTYPE **buffers,
     buffer_retain_t *retains,
-    OMX_U32 numberBuffers) {
+    OMX_U32) {
 
     OMX_ERRORTYPE oret = OMX_ErrorNone;
     Encode_Status ret = ENCODE_SUCCESS;
@@ -690,7 +691,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamVideoProfileLevelQuerySupported(OMX_PT
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamVideoProfileLevelQuerySupported(OMX_PTR) {
     LOGW("SetParamVideoAVCProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
@@ -799,9 +800,9 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamNalStreamFormat(OMX_PTR pStructure) {
     CHECK_PORT_INDEX(p, OUTPORT_INDEX);
     LOGV("p->eNaluFormat =%d\n",p->eNaluFormat);
     if(p->eNaluFormat != OMX_NaluFormatStartCodes &&
-            p->eNaluFormat != OMX_NaluFormatStartCodesSeparateFirstHeader &&
+            p->eNaluFormat != (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader &&
             p->eNaluFormat != OMX_NaluFormatOneNaluPerBuffer &&
-            p->eNaluFormat != OMX_NaluFormatLengthPrefixedSeparateFirstHeader) {
+            p->eNaluFormat != (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader) {
         LOGE("Format not support\n");
         return OMX_ErrorUnsupportedSetting;
     }
@@ -827,12 +828,12 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamNalStreamFormatSupported(OMX_PTR pStru
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamNalStreamFormatSupported(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamNalStreamFormatSupported(OMX_PTR) {
     LOGW("SetParamNalStreamFormatSupported is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamNalStreamFormatSelect(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamNalStreamFormatSelect(OMX_PTR) {
     LOGW("GetParamNalStreamFormatSelect is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
@@ -847,9 +848,9 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamNalStreamFormatSelect(OMX_PTR pStructu
     CHECK_SET_PARAM_STATE();
 
     if (p->eNaluFormat != OMX_NaluFormatStartCodes &&
-            p->eNaluFormat != OMX_NaluFormatStartCodesSeparateFirstHeader &&
+            p->eNaluFormat != (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader &&
             p->eNaluFormat != OMX_NaluFormatOneNaluPerBuffer&&
-            p->eNaluFormat != OMX_NaluFormatLengthPrefixedSeparateFirstHeader) {
+            p->eNaluFormat != (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader) {
         //p->eNaluFormat != OMX_NaluFormatFourByteInterleaveLength &&
         //p->eNaluFormat != OMX_NaluFormatZeroByteInterleaveLength) {
         // TODO: check if this is desried
@@ -954,7 +955,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetConfigVideoNalSize(OMX_PTR pStructure) {
     // TODO: return OMX_ErrorIncorrectStateOperation?
     CHECK_SET_CONFIG_STATE();
 
-    if (mParamBitrate.eControlRate != OMX_Video_Intel_ControlRateVideoConferencingMode) {
+    if (mParamBitrate.eControlRate != (OMX_VIDEO_CONTROLRATETYPE)OMX_Video_Intel_ControlRateVideoConferencingMode) {
         LOGE("SetConfigVideoNalSize failed. Feature is supported only in VCM.");
         return OMX_ErrorUnsupportedSetting;
     }
@@ -995,7 +996,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetConfigIntelSliceNumbers(OMX_PTR pStructure)
     // TODO: return OMX_ErrorIncorrectStateOperation?
     CHECK_SET_CONFIG_STATE();
 
-    if (mParamBitrate.eControlRate != OMX_Video_Intel_ControlRateVideoConferencingMode) {
+    if (mParamBitrate.eControlRate != (OMX_VIDEO_CONTROLRATETYPE)OMX_Video_Intel_ControlRateVideoConferencingMode) {
         LOGE("SetConfigIntelSliceNumbers failed. Feature is supported only in VCM.");
         return OMX_ErrorUnsupportedSetting;
     }
@@ -1035,7 +1036,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamIntelAVCVUI(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamVideoBytestream(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamVideoBytestream(OMX_PTR) {
     return OMX_ErrorUnsupportedSetting;
 }
 
diff --git a/videocodec/OMXVideoEncoderAVC.h b/videocodec/OMXVideoEncoderAVC.h
index bb4d455..629f042 100644
--- a/videocodec/OMXVideoEncoderAVC.h
+++ b/videocodec/OMXVideoEncoderAVC.h
@@ -22,7 +22,7 @@
 #include "OMXVideoEncoderBase.h"
 #include <utils/List.h>
 #include <IntelMetadataBuffer.h>
-
+#include <OMX_VideoExt.h>
 enum {
     F_UNKNOWN = 0x00,    // Unknown
     F_I       = 0x01,    // General I-frame type
diff --git a/videocodec/OMXVideoEncoderBase.cpp b/videocodec/OMXVideoEncoderBase.cpp
index a8771a0..bc37f4f 100644
--- a/videocodec/OMXVideoEncoderBase.cpp
+++ b/videocodec/OMXVideoEncoderBase.cpp
@@ -28,11 +28,11 @@ OMXVideoEncoderBase::OMXVideoEncoderBase()
     ,mEncoderParams(NULL)
     ,mFrameInputCount(0)
     ,mFrameOutputCount(0)
-    ,mFrameRetrieved(OMX_TRUE)
     ,mFirstFrame(OMX_TRUE)
-    ,mOmxLogLevel(0)
+    ,mFrameRetrieved(OMX_TRUE)
     ,mStoreMetaDataInBuffers(OMX_FALSE)
     ,mSyncEncoding(OMX_TRUE)
+    ,mOmxLogLevel(0)
     ,mBlackFramePointer(NULL) {
     mEncoderParams = new VideoParamsCommon();
     if (!mEncoderParams) LOGE("OMX_ErrorInsufficientResources");
@@ -258,7 +258,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::InitOutputPort(void) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderBase::InitInputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionInput) {
+OMX_ERRORTYPE OMXVideoEncoderBase::InitInputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *) {
     // no format specific to initialize input
     return OMX_ErrorNone;
 }
@@ -318,7 +318,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetVideoEncoderParam() {
             (mParamBitrate.eControlRate == OMX_Video_ControlRateVariableSkipFrames)) {
         LOGV("%s(), eControlRate == OMX_Video_Intel_ControlRateVariable", __func__);
         mEncoderParams->rcMode = RATE_CONTROL_VBR;
-    } else if (mParamBitrate.eControlRate == OMX_Video_Intel_ControlRateVideoConferencingMode) {
+    } else if (mParamBitrate.eControlRate == (OMX_VIDEO_CONTROLRATETYPE)OMX_Video_Intel_ControlRateVideoConferencingMode) {
         LOGV("%s(), eControlRate == OMX_Video_Intel_ControlRateVideoConferencingMode ", __func__);
         mEncoderParams->rcMode = RATE_CONTROL_VCM;
         if(mConfigIntelBitrate.nMaxEncodeBitrate >0)
@@ -371,9 +371,9 @@ OMX_ERRORTYPE OMXVideoEncoderBase::ProcessorStop(void) {
     return OMX_ErrorNone;
 }
 OMX_ERRORTYPE OMXVideoEncoderBase:: ProcessorProcess(
-    OMX_BUFFERHEADERTYPE **buffers,
-    buffer_retain_t *retains,
-    OMX_U32 numberBuffers) {
+    OMX_BUFFERHEADERTYPE **,
+    buffer_retain_t *,
+    OMX_U32) {
 
     LOGV("OMXVideoEncoderBase:: ProcessorProcess \n");
     return OMX_ErrorNone;
@@ -710,7 +710,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetConfigVideoFramerate(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderBase::GetConfigVideoIntraVOPRefresh(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderBase::GetConfigVideoIntraVOPRefresh(OMX_PTR) {
     LOGW("GetConfigVideoIntraVOPRefresh is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
@@ -861,11 +861,11 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetSyncEncoding(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 };
 
-OMX_ERRORTYPE OMXVideoEncoderBase::GetPrependSPSPPS(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderBase::GetPrependSPSPPS(OMX_PTR) {
     return OMX_ErrorNone;
 };
 
-OMX_ERRORTYPE OMXVideoEncoderBase::SetPrependSPSPPS(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderBase::SetPrependSPSPPS(OMX_PTR) {
     LOGD("SetPrependSPSPPS success");
     return OMX_ErrorNone;
 };
@@ -926,12 +926,12 @@ OMX_ERRORTYPE OMXVideoEncoderBase::GetBlackFramePointer(OMX_PTR pStructure) {
             return OMX_ErrorInsufficientResources;
         }
         memset(mBlackFramePointer, 0x0, lumaSize);
-        memset(mBlackFramePointer + lumaSize, 0x80, lumaSize / 2);
+        memset((OMX_PTR)((uint64_t)mBlackFramePointer + lumaSize), 0x80, lumaSize / 2);
         p->nFramePointer = (OMX_U32)mBlackFramePointer;
     }
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderBase::SetBlackFramePointer(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderBase::SetBlackFramePointer(OMX_PTR) {
     return OMX_ErrorUnsupportedSetting;
 }
diff --git a/videocodec/OMXVideoEncoderH263.cpp b/videocodec/OMXVideoEncoderH263.cpp
index 4066fbf..e87ae1a 100644
--- a/videocodec/OMXVideoEncoderH263.cpp
+++ b/videocodec/OMXVideoEncoderH263.cpp
@@ -87,7 +87,7 @@ OMX_ERRORTYPE OMXVideoEncoderH263::ProcessorDeinit(void) {
 OMX_ERRORTYPE OMXVideoEncoderH263::ProcessorProcess(
     OMX_BUFFERHEADERTYPE **buffers,
     buffer_retain_t *retains,
-    OMX_U32 numberBuffers) {
+    OMX_U32) {
     LOGV("OMXVideoEncoderH263::ProcessorProcess \n");
 
     VideoEncOutputBuffer outBuf;
@@ -219,7 +219,7 @@ out:
         buffers[OUTPORT_INDEX]->nTimeStamp = outtimestamp;
         buffers[OUTPORT_INDEX]->nFlags = outflags;
 
-        LOGV("********** output buffer: len=%d, ts=%ld, flags=%x",
+        LOGV("********** output buffer: len=%d, ts=%lld, flags=%x",
              outfilledlen,
              outtimestamp,
              outflags);
@@ -268,7 +268,7 @@ OMX_ERRORTYPE OMXVideoEncoderH263::GetParamVideoProfileLevelQuerySupported(OMX_P
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderH263::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderH263::SetParamVideoProfileLevelQuerySupported(OMX_PTR) {
     LOGW("SetParamVideoH263ProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
diff --git a/videocodec/OMXVideoEncoderMPEG4.cpp b/videocodec/OMXVideoEncoderMPEG4.cpp
index c3e6a5c..34a9d9c 100644
--- a/videocodec/OMXVideoEncoderMPEG4.cpp
+++ b/videocodec/OMXVideoEncoderMPEG4.cpp
@@ -80,7 +80,7 @@ OMX_ERRORTYPE OMXVideoEncoderMPEG4::ProcessorDeinit(void) {
 OMX_ERRORTYPE OMXVideoEncoderMPEG4::ProcessorProcess(
     OMX_BUFFERHEADERTYPE **buffers,
     buffer_retain_t *retains,
-    OMX_U32 numberBuffers) {
+    OMX_U32) {
 
     VideoEncOutputBuffer outBuf;
     VideoEncRawBuffer inBuf;
@@ -266,7 +266,7 @@ OMX_ERRORTYPE OMXVideoEncoderMPEG4::GetParamVideoProfileLevelQuerySupported(OMX_
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderMPEG4::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderMPEG4::SetParamVideoProfileLevelQuerySupported(OMX_PTR) {
     LOGW("SetParamVideoMpeg4ProfileLevel is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
diff --git a/videocodec/OMXVideoEncoderVP8.cpp b/videocodec/OMXVideoEncoderVP8.cpp
index e071ac0..d2a2aee 100644
--- a/videocodec/OMXVideoEncoderVP8.cpp
+++ b/videocodec/OMXVideoEncoderVP8.cpp
@@ -72,7 +72,7 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::ProcessorDeinit(void) {
 
 OMX_ERRORTYPE OMXVideoEncoderVP8::ProcessorProcess(OMX_BUFFERHEADERTYPE **buffers,
         buffer_retain_t *retains,
-        OMX_U32 numberBuffers) {
+        OMX_U32) {
 
     VideoEncOutputBuffer outBuf;
     VideoEncRawBuffer inBuf;
@@ -273,7 +273,7 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVideoVp8ReferenceFrame(OMX_PTR pStruc
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8MaxFrameSizeRatio(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8MaxFrameSizeRatio(OMX_PTR) {
 
     return OMX_ErrorNone;
 }
diff --git a/videocodec/OMXVideoEncoderVP8.h b/videocodec/OMXVideoEncoderVP8.h
index 12b006b..afafb7f 100644
--- a/videocodec/OMXVideoEncoderVP8.h
+++ b/videocodec/OMXVideoEncoderVP8.h
@@ -2,6 +2,7 @@
 #ifndef OMX_VIDEO_ENCODER_VP8_H
 #define OMX_VIDEO_ENCODER_VP8_H
 
+#include <OMX_VideoExt.h>
 #include "OMXVideoEncoderBase.h"
 
 class OMXVideoEncoderVP8 : public OMXVideoEncoderBase {
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
index 0c06761..3b54a34 100644
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
@@ -245,7 +245,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareWVCDecodeBuffer(OMX_BUFFERHEADERT
    p->flag |= HAS_COMPLETE_FRAME;
 
    if (buffer->nOffset != 0) {
-       LOGW("buffer offset %lu is not zero!!!", buffer->nOffset);
+       LOGW("buffer offset %u is not zero!!!", buffer->nOffset);
    }
 
    DataBuffer *dataBuffer = (DataBuffer *)buffer->pBuffer;
@@ -280,7 +280,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareWVCDecodeBuffer(OMX_BUFFERHEADERT
            ret =  OMX_ErrorNotReady;
        } else if (res != 0) {
            mSessionPaused = false;
-           LOGE("Drm_WV_ReturnNALUHeaders failed. Error = %#x, frame_size: %d, len = %lu", res, nalu_headers.frame_size, buffer->nFilledLen);
+           LOGE("Drm_WV_ReturnNALUHeaders failed. Error = %#x, frame_size: %d, len = %u", res, nalu_headers.frame_size, buffer->nFilledLen);
            ret = OMX_ErrorHardware;
        } else {
            mSessionPaused = false;
@@ -318,7 +318,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareCENCDecodeBuffer(OMX_BUFFERHEADER
     p->flag |= HAS_COMPLETE_FRAME | IS_SUBSAMPLE_ENCRYPTION;
 
     if (buffer->nOffset != 0) {
-        LOGW("buffer offset %lu is not zero!!!", buffer->nOffset);
+        LOGW("buffer offset %u is not zero!!!", buffer->nOffset);
     }
 
     DataBuffer *dataBuffer = (DataBuffer *)buffer->pBuffer;
@@ -341,7 +341,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PreparePRASFDecodeBuffer(OMX_BUFFERHEADE
     p->flag |= HAS_COMPLETE_FRAME;
 
     if (buffer->nOffset != 0) {
-        LOGW("PR:buffer offset %lu is not zero!!!", buffer->nOffset);
+        LOGW("PR:buffer offset %u is not zero!!!", buffer->nOffset);
     }
 
     DataBuffer *dataBuffer = (DataBuffer *)buffer->pBuffer;
@@ -376,7 +376,7 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PreparePRASFDecodeBuffer(OMX_BUFFERHEADE
             ret =  OMX_ErrorNotReady;
         } else if (res != 0) {
             mSessionPaused = false;
-            LOGE("drm_pr_return_naluheaders failed. Error = %#x, frame_size: %d, len = %lu", res, nalu_headers.frame_size, buffer->nFilledLen);
+            LOGE("drm_pr_return_naluheaders failed. Error = %#x, frame_size: %d, len = %u", res, nalu_headers.frame_size, buffer->nFilledLen);
             ret = OMX_ErrorHardware;
         } else {
            mSessionPaused = false;
@@ -506,10 +506,10 @@ void OMXVideoDecoderAVCSecure::MemFreeDataBuffer(OMX_U8 *pBuffer, OMX_PTR pUserD
 
 OMX_U8* OMXVideoDecoderAVCSecure::MemAllocDataBuffer(OMX_U32 nSizeBytes) {
     if (nSizeBytes > INPORT_BUFFER_SIZE) {
-        LOGE("Invalid size (%lu) of memory to allocate.", nSizeBytes);
+        LOGE("Invalid size (%u) of memory to allocate.", nSizeBytes);
         return NULL;
     }
-    LOGW_IF(nSizeBytes != INPORT_BUFFER_SIZE, "Size of memory to allocate is %lu", nSizeBytes);
+    LOGW_IF(nSizeBytes != INPORT_BUFFER_SIZE, "Size of memory to allocate is %u", nSizeBytes);
     for (int i = 0; i < INPORT_ACTUAL_BUFFER_COUNT; i++) {
         if (mDataBufferSlot[i].owner == NULL) {
             DataBuffer *pBuffer = new DataBuffer;