media: Fix compiler warningslineage-17.0-caf-msm8960

Change-Id: I5aa9b7c68c25e0503996a09b1d596ebdd281a01c

9 files changed, 95 insertions, 81 deletions

diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 2a95161d..f1c84d45 100755
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 
 OMXCORE_CFLAGS += -D_ANDROID_
 OMXCORE_CFLAGS += -U_ENABLE_QC_MSG_LOG_
-OMXCORE_CFLAGS += -Wno-error
+OMXCORE_CFLAGS += -Wno-error -Wno-unused-parameter
 
 #===============================================================================
 #             Figure out the targets
diff --git a/mm-core/src/common/qc_omx_core.c b/mm-core/src/common/qc_omx_core.c
index c8b560cf..5dc75a39 100644
--- a/mm-core/src/common/qc_omx_core.c
+++ b/mm-core/src/common/qc_omx_core.c
@@ -508,7 +508,7 @@ OMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComp)
     {
         pthread_mutex_lock(&lock_core);
         /* Unload component library */
-    if( (i < SIZE_OF_CORE) && core[i].so_lib_handle)
+    if( (i < (int)SIZE_OF_CORE) && core[i].so_lib_handle)
     {
            if(check_lib_unload(i))
            {
diff --git a/mm-video/vidc/common/src/extra_data_handler.cpp b/mm-video/vidc/common/src/extra_data_handler.cpp
index 8eaa31b9..bb01c31b 100644
--- a/mm-video/vidc/common/src/extra_data_handler.cpp
+++ b/mm-video/vidc/common/src/extra_data_handler.cpp
@@ -239,7 +239,7 @@ OMX_S32 extra_data_handler::parse_sliceinfo(
     DEBUG_PRINT_ERROR("unknown error in slice info extradata");
     return -1;
   }
-  for (int i = 0; i < num_slices; i++) {
+  for (OMX_U32 i = 0; i < num_slices; i++) {
     slice_offset = (OMX_U32)(*(data + (i*2 + 1)));
     if ((*(pBuffer + slice_offset + 0) != 0x00) ||
         (*(pBuffer + slice_offset + 1) != 0x00) ||
diff --git a/mm-video/vidc/vdec/Android.mk b/mm-video/vidc/vdec/Android.mk
index b66bbec7..dc4344c2 100644
--- a/mm-video/vidc/vdec/Android.mk
+++ b/mm-video/vidc/vdec/Android.mk
@@ -99,7 +99,7 @@ LOCAL_SRC_FILES         += ../common/src/vidc_color_converter.cpp
 
 # omx_vdec.cpp: address of array 'extra->data' will always evaluate to 'true'
 LOCAL_CLANG_CFLAGS      += -Wno-pointer-bool-conversion
-LOCAL_CFLAGS            += -Wno-error
+LOCAL_CFLAGS            += -Wno-error -Wno-unused-parameter -Wno-format
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/mm-video/vidc/vdec/src/h264_utils.cpp b/mm-video/vidc/vdec/src/h264_utils.cpp
index 7e77a3fb..2571d2db 100644
--- a/mm-video/vidc/vdec/src/h264_utils.cpp
+++ b/mm-video/vidc/vdec/src/h264_utils.cpp
@@ -314,7 +314,7 @@ boolean H264_Utils::extract_rbsp(OMX_IN   OMX_U8  *buffer,
     ALOGE("ERROR: In %s() - line %d", __func__, __LINE__);
     return false;
   }
-  if (nal_unit->forbidden_zero_bit = (buffer[pos] & 0x80))
+  if ((nal_unit->forbidden_zero_bit = (buffer[pos] & 0x80)) != 0)
   {
     ALOGE("ERROR: In %s() - line %d", __func__, __LINE__);
   }
@@ -757,7 +757,7 @@ void h264_stream_parser::aspect_ratio_info()
 
 void h264_stream_parser::hrd_parameters(h264_hrd_param *hrd_param)
 {
-  int idx;
+  OMX_U32 idx;
   ALOGV("hrd_parameters: IN");
   hrd_param->cpb_cnt = uev() + 1;
   hrd_param->bit_rate_scale = extract_bits(4);
@@ -841,7 +841,7 @@ void h264_stream_parser::parse_sei()
 
 void h264_stream_parser::sei_buffering_period()
 {
-  int idx;
+  OMX_U32 idx;
   OMX_U32 value = 0;
   h264_hrd_param *hrd_param = NULL;
   ALOGV("@@sei_buffering_period: IN");
@@ -930,7 +930,7 @@ void h264_stream_parser::sei_picture_timing()
         ALOGE("sei_picture_timing: pic_struct invalid!");
     }
     ALOGV("-->num_clock_ts      : %u", sei_pic_timing.num_clock_ts);
-    for (int i = 0; i < sei_pic_timing.num_clock_ts && more_bits(); i++)
+    for (OMX_U32 i = 0; i < sei_pic_timing.num_clock_ts && more_bits(); i++)
     {
       sei_pic_timing.clock_ts_flag = extract_bits(1);
       if(sei_pic_timing.clock_ts_flag)
@@ -1024,7 +1024,7 @@ void h264_stream_parser::sei_pan_scan()
       return;
     }
 
-    for (int i = 0; i < pan_scan_param->cnt; i++)
+    for (OMX_U32 i = 0; i < pan_scan_param->cnt; i++)
     {
       pan_scan_param->rect_left_offset[i] = sev();
       pan_scan_param->rect_right_offset[i] = sev();
@@ -1056,7 +1056,7 @@ void h264_stream_parser::print_pan_data(h264_pan_scan *pan_scan_param)
 
   ALOGV("-->cnt                : %u", pan_scan_param->cnt);
 
-  for (int i = 0; i < pan_scan_param->cnt; i++)
+  for (OMX_U32 i = 0; i < pan_scan_param->cnt; i++)
   {
     ALOGE("-->rect_left_offset   : %d", pan_scan_param->rect_left_offset[i]);
     ALOGE("-->rect_right_offset  : %d", pan_scan_param->rect_right_offset[i]);
@@ -1090,14 +1090,18 @@ void h264_stream_parser::parse_sps()
     uev(); //bit_depth_chroma_minus8
     extract_bits(1); //qpprime_y_zero_transform_bypass_flag
     if (extract_bits(1)) //seq_scaling_matrix_present_flag
-      for (int i = 0; i < scaling_matrix_limit && more_bits(); i++)
+    {
+      for (OMX_U32 i = 0; i < scaling_matrix_limit && more_bits(); i++)
       {
         if (extract_bits(1)) ////seq_scaling_list_present_flag[ i ]
+        {
           if (i < 6)
             scaling_list(16);
           else
             scaling_list(64);
+        }
       }
+    }
   }
   uev(); //log2_max_frame_num_minus4
   value = uev(); //pic_order_cnt_type
@@ -1109,7 +1113,7 @@ void h264_stream_parser::parse_sps()
     sev(); //offset_for_non_ref_pic
     sev(); //offset_for_top_to_bottom_field
     value = uev(); // num_ref_frames_in_pic_order_cnt_cycle
-    for (int i = 0; i < value; i++)
+    for (OMX_U32 i = 0; i < value; i++)
       sev(); //offset_for_ref_frame[ i ]
   }
   uev(); //max_num_ref_frames
@@ -1134,7 +1138,7 @@ void h264_stream_parser::parse_sps()
 void h264_stream_parser::scaling_list(OMX_U32 size_of_scaling_list)
 {
   OMX_S32 last_scale = 8, next_scale = 8, delta_scale;
-  for (int j = 0; j < size_of_scaling_list; j++)
+  for (OMX_U32 j = 0; j < size_of_scaling_list; j++)
   {
     if (next_scale != 0)
     {
@@ -1456,11 +1460,12 @@ void h264_stream_parser::fill_pan_scan_data(OMX_QCOM_PANSCAN *dest_pan_scan, OMX
   h264_pan_scan *pan_scan_param = &panscan_param;
 #endif
   if (pan_scan_param)
+  {
     if (!(pan_scan_param->rect_id & NO_PAN_SCAN_BIT))
     {
       PRINT_PANSCAN_PARAM(*pan_scan_param);
       dest_pan_scan->numWindows = pan_scan_param->cnt;
-      for (int i = 0; i < dest_pan_scan->numWindows; i++)
+      for (OMX_U32 i = 0; i < dest_pan_scan->numWindows; i++)
       {
         dest_pan_scan->window[i].x = pan_scan_param->rect_left_offset[i];
         dest_pan_scan->window[i].y = pan_scan_param->rect_top_offset[i];
@@ -1478,6 +1483,7 @@ void h264_stream_parser::fill_pan_scan_data(OMX_QCOM_PANSCAN *dest_pan_scan, OMX
     }
     else
       pan_scan_param->rect_repetition_period = 0;
+  }
 }
 
 OMX_S64 h264_stream_parser::process_ts_with_sei_vui(OMX_S64 timestamp)
@@ -1613,11 +1619,13 @@ h264_pan_scan *panscan_handler::get_populated(OMX_S64 frame_ts)
     }
   }
   if (data)
+  {
     if (data->rect_repetition_period == 0)
       panscan_free.add_last(panscan_used.remove_first());
     else if (data->rect_repetition_period > 1)
       data->rect_repetition_period -= 2;
   PRINT_PANSCAN_DATA(panscan_node);
+  }
   return data;
 }
 
diff --git a/mm-video/vidc/vdec/src/omx_vdec.cpp b/mm-video/vidc/vdec/src/omx_vdec.cpp
index e9c834f4..1c14c5e9 100644
--- a/mm-video/vidc/vdec/src/omx_vdec.cpp
+++ b/mm-video/vidc/vdec/src/omx_vdec.cpp
@@ -1291,6 +1291,7 @@ void omx_vdec::process_event_cb(void *ctxt, unsigned char id)
             DEBUG_PRINT_ERROR("ERROR: %s()::EventHandler is NULL", __func__);
           }
         }
+          break;
         default:
           break;
         }
@@ -2249,9 +2250,12 @@ OMX_ERRORTYPE  omx_vdec::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp,
   else if(m_state == OMX_StateInvalid)
   {
     /* State Transition from Inavlid to any state */
-    if(eState == (OMX_StateLoaded || OMX_StateWaitForResources
-                  || OMX_StateIdle || OMX_StateExecuting
-                  || OMX_StatePause || OMX_StateInvalid))
+        if ((eState == OMX_StateLoaded) ||
+            (eState == OMX_StateWaitForResources) ||
+            (eState == OMX_StateIdle) ||
+            (eState == OMX_StateExecuting) ||
+            (eState == OMX_StatePause) ||
+            (eState == OMX_StateInvalid))
     {
       DEBUG_PRINT_ERROR("ERROR::send_command_proxy(): Invalid -->Loaded\n");
       post_event(OMX_EventError,OMX_ErrorInvalidState,\
@@ -4316,7 +4320,7 @@ OMX_ERRORTYPE  omx_vdec::set_config(OMX_IN OMX_HANDLETYPE      hComp,
             }
             m_vc1_profile = VC1_AP;
         }
-        else if ((config->nDataSize == VC1_STRUCT_C_LEN))
+        else if (config->nDataSize == VC1_STRUCT_C_LEN)
         {
             DEBUG_PRINT_LOW("set_config - VC1 Simple/Main profile struct C only\n");
             m_vendor_config.nPortIndex = config->nPortIndex;
diff --git a/mm-video/vidc/venc/Android.mk b/mm-video/vidc/venc/Android.mk
index 505dc83e..7a724053 100644
--- a/mm-video/vidc/venc/Android.mk
+++ b/mm-video/vidc/venc/Android.mk
@@ -81,7 +81,8 @@ endif
 
 LOCAL_SRC_FILES   += ../common/src/extra_data_handler.cpp
 
-LOCAL_CFLAGS      += -Wno-error
+LOCAL_CFLAGS      += -Wno-error -Wno-unused-parameter -Wno-format
+LOCAL_CFLAGS      += -Wno-switch -Wno-enum-compare -Wno-enum-compare-switch
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/mm-video/vidc/venc/src/omx_video_base.cpp b/mm-video/vidc/venc/src/omx_video_base.cpp
index 5b7e5767..ba3cc837 100644
--- a/mm-video/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video/vidc/venc/src/omx_video_base.cpp
@@ -227,36 +227,37 @@ PARAMETERS
 RETURN VALUE
   None.
 ========================================================================== */
-omx_video::omx_video(): m_state(OMX_StateInvalid),
-                        m_app_data(NULL),
-                        m_inp_mem_ptr(NULL),
-                        m_out_mem_ptr(NULL),
+omx_video::omx_video():
+                        c2d_opened(false),
+                        psource_frame(NULL),
+                        pdest_frame(NULL),
+                        secure_session(false),
                         m_pInput_pmem(NULL),
                         m_pOutput_pmem(NULL),
 #ifdef USE_ION
                         m_pInput_ion(NULL),
                         m_pOutput_ion(NULL),
 #endif
+                        m_error_propogated(false),
+                        m_state(OMX_StateInvalid),
+                        m_app_data(NULL),
+                        m_use_input_pmem(OMX_FALSE),
+                        m_use_output_pmem(OMX_FALSE),
+                        m_input_msg_id(OMX_COMPONENT_GENERATE_ETB),
+                        m_inp_mem_ptr(NULL),
+                        m_out_mem_ptr(NULL),
+                        input_flush_progress (false),
+                        output_flush_progress (false),
+                        input_use_buffer (false),
+                        output_use_buffer (false),
                         pending_input_buffers(0),
                         pending_output_buffers(0),
                         m_out_bm_count(0),
                         m_inp_bm_count(0),
                         m_flags(0),
-                        m_event_port_settings_sent(false),
-                        output_flush_progress (false),
-                        input_flush_progress (false),
-                        input_use_buffer (false),
-                        output_use_buffer (false),
-                        m_use_input_pmem(OMX_FALSE),
-                        m_use_output_pmem(OMX_FALSE),
                         m_etb_count(0),
                         m_fbd_count(0),
-                        m_error_propogated(false),
-                        m_input_msg_id(OMX_COMPONENT_GENERATE_ETB),
-                        psource_frame(NULL),
-                        pdest_frame(NULL),
-                        c2d_opened(false),
-                        secure_session(false)
+                        m_event_port_settings_sent(false)
 {
   DEBUG_PRINT_HIGH("\n omx_video(): Inside Constructor()");
   memset(&m_cmp,0,sizeof(m_cmp));
@@ -413,7 +414,7 @@ void omx_video::process_event_cb(void *ctxt, unsigned char id)
 
           case OMX_EventError:
             DEBUG_PRINT_ERROR("\nERROR: OMX_EventError: p2 = %d\n", p2);
-            if(p2 == OMX_ErrorHardware)
+            if(p2 == (unsigned)OMX_ErrorHardware)
             {
               pThis->m_pCallbacks.EventHandler(&pThis->m_cmp, pThis->m_app_data,
                                                OMX_EventError,OMX_ErrorHardware,0,NULL);
@@ -421,7 +422,7 @@ void omx_video::process_event_cb(void *ctxt, unsigned char id)
             else
             {
               pThis->m_pCallbacks.EventHandler(&pThis->m_cmp, pThis->m_app_data,
-                                               OMX_EventError, p2, NULL, NULL );
+                                               OMX_EventError, p2, 0, 0 );
 
             }
             break;
@@ -697,7 +698,7 @@ void omx_video::process_event_cb(void *ctxt, unsigned char id)
           DEBUG_PRINT_ERROR("Sending QOMX_ErrorLTRUseFailed, p2 = 0x%x", p2);
           pThis->m_pCallbacks.EventHandler(&pThis->m_cmp, pThis->m_app_data,
                                            OMX_EventError, QOMX_ErrorLTRUseFailed,
-                                           NULL, NULL);
+                                           0, 0);
         }
         break;
       case OMX_COMPONENT_GENERATE_HARDWARE_ERROR:
@@ -788,7 +789,7 @@ OMX_ERRORTYPE  omx_video::send_command(OMX_IN OMX_HANDLETYPE hComp,
 
   if(cmd == OMX_CommandFlush || cmd == OMX_CommandPortDisable || cmd == OMX_CommandPortEnable)
   {
-    if((param1 != PORT_INDEX_IN) && (param1 != PORT_INDEX_OUT) && (param1 != PORT_INDEX_BOTH))
+    if((param1 != (OMX_U32)PORT_INDEX_IN) && (param1 != (OMX_U32)PORT_INDEX_OUT) && (param1 != (OMX_U32)PORT_INDEX_BOTH))
     {
       DEBUG_PRINT_ERROR("ERROR: omx_video::send_command-->bad port index\n");
       return OMX_ErrorBadPortIndex;
@@ -1091,7 +1092,7 @@ OMX_ERRORTYPE  omx_video::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp,
         {
           m_flags = BITMASK_SET_U32(m_flags,OMX_COMPONENT_EXECUTE_PENDING);
           DEBUG_PRINT_LOW("OMXCORE-SM: Pause-->Executing\n");
-          post_event (NULL, NULL, OMX_COMPONENT_GENERATE_RESUME_DONE);
+          post_event (0, 0, OMX_COMPONENT_GENERATE_RESUME_DONE);
           bFlag = 0;
         }
       }
@@ -1201,9 +1202,12 @@ OMX_ERRORTYPE  omx_video::send_command_proxy(OMX_IN OMX_HANDLETYPE hComp,
   else if(m_state == OMX_StateInvalid)
   {
     /* State Transition from Inavlid to any state */
-    if(eState == (OMX_StateLoaded || OMX_StateWaitForResources
-                  || OMX_StateIdle || OMX_StateExecuting
-                  || OMX_StatePause || OMX_StateInvalid))
+    if ((eState == OMX_StateLoaded) ||
+        (eState == OMX_StateWaitForResources) ||
+        (eState == OMX_StateIdle) ||
+        (eState == OMX_StateExecuting) ||
+        (eState == OMX_StatePause) ||
+        (eState == OMX_StateInvalid))
     {
       DEBUG_PRINT_ERROR("ERROR: OMXCORE-SM: Invalid -->Loaded\n");
       post_event(OMX_EventError,OMX_ErrorInvalidState,\
@@ -1555,7 +1559,7 @@ OMX_ERRORTYPE  omx_video::get_parameter(OMX_IN OMX_HANDLETYPE     hComp,
     DEBUG_PRINT_ERROR("ERROR: Get Param in Invalid paramData \n");
     return OMX_ErrorBadParameter;
   }
-  switch(paramIndex)
+  switch((int)paramIndex)
   {
   case OMX_IndexParamPortDefinition:
     {
@@ -1630,7 +1634,7 @@ OMX_ERRORTYPE  omx_video::get_parameter(OMX_IN OMX_HANDLETYPE     hComp,
 
       if(portFmt->nPortIndex == (OMX_U32) PORT_INDEX_IN)
       {
-          int index = portFmt->nIndex;
+          unsigned index = portFmt->nIndex;
           //we support following formats
           //index 0 - YUV420SP32m
           //index 1 - opaque which internally maps to YUV420SP.
@@ -2007,7 +2011,7 @@ OMX_ERRORTYPE  omx_video::get_config(OMX_IN OMX_HANDLETYPE      hComp,
   }
 
   //@todo need to validate params
-  switch(configIndex)
+  switch((int)configIndex)
   {
   case OMX_IndexConfigVideoBitrate:
     {
@@ -2067,34 +2071,31 @@ OMX_ERRORTYPE  omx_video::get_extension_index(OMX_IN OMX_HANDLETYPE      hComp,
                                               OMX_IN OMX_STRING      paramName,
                                               OMX_OUT OMX_INDEXTYPE* indexType)
 {
-  char *extns[] = {
-    "OMX.QCOM.index.param.SliceDeliveryMode",
-    "OMX.google.android.index.storeMetaDataInBuffers",
-    "OMX.google.android.index.prependSPSPPSToIDRFrames",
-    "OMX.google.android.index.setVUIStreamRestrictFlag"
-  };
-
   if(m_state == OMX_StateInvalid)
   {
     DEBUG_PRINT_ERROR("ERROR: Get Extension Index in Invalid State\n");
     return OMX_ErrorInvalidState;
   }
 #ifdef MAX_RES_1080P
-  if (!strncmp(paramName, extns[0], strlen(extns[0]))) {
+  if (!strncmp(paramName, "OMX.QCOM.index.param.SliceDeliveryMode",
+      sizeof("OMX.QCOM.index.param.SliceDeliveryMode") - 1)) {
     *indexType = (OMX_INDEXTYPE)OMX_QcomIndexEnableSliceDeliveryMode;
     return OMX_ErrorNone;
   }
 #endif
 #ifdef _ANDROID_ICS_
-  if (!strncmp(paramName, extns[1], strlen(extns[1]))) {
-        *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamVideoEncodeMetaBufferMode;
-        return OMX_ErrorNone;
-  } else if (!strncmp(paramName, extns[2], strlen(extns[2]))) {
-        *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamSequenceHeaderWithIDR;
-        return OMX_ErrorNone;
-  } else if (!strncmp(paramName, extns[3], strlen(extns[3]))) {
-        *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamEnableVUIStreamRestrictFlag;
-        return OMX_ErrorNone;
+  if (!strncmp(paramName, "OMX.google.android.index.storeMetaDataInBuffers",
+      sizeof("OMX.google.android.index.storeMetaDataInBuffers") - 1)) {
+    *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamVideoEncodeMetaBufferMode;
+    return OMX_ErrorNone;
+  } else if (!strncmp(paramName, "OMX.google.android.index.prependSPSPPSToIDRFrames",
+      sizeof("OMX.google.android.index.prependSPSPPSToIDRFrames") - 1)) {
+    *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamSequenceHeaderWithIDR;
+    return OMX_ErrorNone;
+  } else if (!strncmp(paramName, "OMX.google.android.index.setVUIStreamRestrictFlag",
+      sizeof("OMX.google.android.index.setVUIStreamRestrictFlag") - 1)) {
+    *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamEnableVUIStreamRestrictFlag;
+    return OMX_ErrorNone;
   }
 #endif
   return OMX_ErrorNotImplemented;
@@ -2485,11 +2486,11 @@ OMX_ERRORTYPE  omx_video::use_output_buffer(
       else
       {
         OMX_QCOM_PLATFORM_PRIVATE_PMEM_INFO *pParam = reinterpret_cast<OMX_QCOM_PLATFORM_PRIVATE_PMEM_INFO*>((*bufferHdr)->pAppPrivate);
-        DEBUG_PRINT_LOW("Inside qcom_ext pParam:0x%x )", pParam);
+        DEBUG_PRINT_LOW("Inside qcom_ext pParam:0x%x )", (unsigned)pParam);
 
         if(pParam)
         {
-          DEBUG_PRINT_LOW("Inside qcom_ext with luma:(fd:%d,offset:0x%x)", pParam->pmem_fd, pParam->offset);
+          DEBUG_PRINT_LOW("Inside qcom_ext with luma:(fd:%d,offset:0x%x)", pParam->pmem_fd, (int)pParam->offset);
           m_pOutput_pmem[i].fd = pParam->pmem_fd;
           m_pOutput_pmem[i].offset = pParam->offset;
           m_pOutput_pmem[i].size = m_sOutPortDef.nBufferSize;
@@ -3712,7 +3713,7 @@ OMX_ERRORTYPE  omx_video::fill_this_buffer_proxy(
 
   DEBUG_PRINT_LOW("\n FTBProxy: bufferAdd->pBuffer[%p]\n", bufferAdd->pBuffer);
 
-  if(bufferAdd == NULL || ((bufferAdd - m_out_mem_ptr) >= m_sOutPortDef.nBufferCountActual) )
+  if(bufferAdd == NULL || ((bufferAdd - m_out_mem_ptr) >= (int)m_sOutPortDef.nBufferCountActual) )
   {
     DEBUG_PRINT_ERROR("\nERROR: FTBProxy: Invalid i/p params\n");
     return OMX_ErrorBadParameter;
@@ -4150,8 +4151,8 @@ OMX_ERRORTYPE omx_video::fill_buffer_done(OMX_HANDLETYPE hComp,
 {
   int idx = buffer - m_out_mem_ptr;
   DEBUG_PRINT_LOW("fill_buffer_done: buffer->pBuffer[%p], flags=0x%x size = %d",
-     buffer->pBuffer, buffer->nFlags,buffer->nFilledLen);
-  if(buffer == NULL || ((buffer - m_out_mem_ptr) > m_sOutPortDef.nBufferCountActual))
+     buffer->pBuffer, (unsigned)buffer->nFlags,buffer->nFilledLen);
+  if(buffer == NULL || ((buffer - m_out_mem_ptr) > (int)m_sOutPortDef.nBufferCountActual))
   {
     DEBUG_PRINT_ERROR("\n ERR: buffer = %p, idx = %d, act_count = %d",
        buffer, idx, m_sOutPortDef.nBufferCountActual);
@@ -4204,8 +4205,8 @@ OMX_ERRORTYPE omx_video::empty_buffer_done(OMX_HANDLETYPE         hComp,
   buffer_index_meta = (buffer - meta_buffer_hdr);
   DEBUG_PRINT_LOW("\n empty_buffer_done: buffer[%p]", buffer);
   if(buffer == NULL ||
-     ((buffer_index > m_sInPortDef.nBufferCountActual) &&
-      (buffer_index_meta > m_sInPortDef.nBufferCountActual)))
+     ((buffer_index > (int)m_sInPortDef.nBufferCountActual) &&
+      (buffer_index_meta > (int)m_sInPortDef.nBufferCountActual)))
   {
     DEBUG_PRINT_ERROR("\n ERROR in empty_buffer_done due to index buffer");
     return OMX_ErrorBadParameter;
@@ -4213,7 +4214,7 @@ OMX_ERRORTYPE omx_video::empty_buffer_done(OMX_HANDLETYPE         hComp,
 
   pending_input_buffers--;
 
-  if(mUseProxyColorFormat && ((OMX_U32)buffer_index < m_sInPortDef.nBufferCountActual)) {
+  if(mUseProxyColorFormat && (buffer_index < (int)m_sInPortDef.nBufferCountActual)) {
     if(!pdest_frame && !input_flush_progress) {
       pdest_frame = buffer;
       DEBUG_PRINT_LOW("\n empty_buffer_done pdest_frame address is %p",pdest_frame);
diff --git a/mm-video/vidc/venc/src/video_encoder_device.cpp b/mm-video/vidc/venc/src/video_encoder_device.cpp
index be477634..3e9a5e23 100644
--- a/mm-video/vidc/venc/src/video_encoder_device.cpp
+++ b/mm-video/vidc/venc/src/video_encoder_device.cpp
@@ -219,11 +219,11 @@ bool venc_dev::venc_open(OMX_U32 codec)
   struct venc_ioctl_msg ioctl_msg = {NULL,NULL};
   int r;
   unsigned int   alignment = 0,buffer_size = 0, temp =0;
-  OMX_STRING device_name = "/dev/msm_vidc_enc";
+  OMX_STRING device_name = (OMX_STRING)"/dev/msm_vidc_enc";
   DEBUG_PRINT_ERROR("\n Is component secure %d",
                   venc_encoder->is_secure_session());
   if(venc_encoder->is_secure_session())
-    device_name = "/dev/msm_vidc_enc_sec";
+    device_name = (OMX_STRING)"/dev/msm_vidc_enc_sec";
   m_nDriver_fd = open (device_name,O_RDWR|O_NONBLOCK);
   if(m_nDriver_fd == 0)
   {
@@ -1670,8 +1670,8 @@ bool venc_dev::venc_use_buf(void *buf_addr, unsigned port,unsigned)
 {
   struct venc_ioctl_msg ioctl_msg = {NULL,NULL};
   struct pmem *pmem_tmp;
-  struct venc_bufferpayload dev_buffer = {0};
-  struct venc_allocatorproperty buff_alloc_property = {0};
+  struct venc_bufferpayload dev_buffer;
+  struct venc_allocatorproperty buff_alloc_property;
 
   pmem_tmp = (struct pmem *)buf_addr;
 
@@ -1769,7 +1769,7 @@ bool venc_dev::venc_free_buf(void *buf_addr, unsigned port)
 {
   struct venc_ioctl_msg ioctl_msg = {NULL,NULL};
   struct pmem *pmem_tmp;
-  struct venc_bufferpayload dev_buffer = {0};
+  struct venc_bufferpayload dev_buffer;
 
   pmem_tmp = (struct pmem *)buf_addr;
 
@@ -3184,11 +3184,11 @@ bool venc_dev::venc_validate_profile_level(OMX_U32 *eProfile, OMX_U32 *eLevel)
   mb_per_sec = mb_per_frame * m_sVenc_cfg.fps_num / m_sVenc_cfg.fps_den;
 
   do{
-      if(mb_per_frame <= (int)profile_tbl[0])
+      if(mb_per_frame <= (unsigned int)profile_tbl[0])
       {
-        if(mb_per_sec <= (int)profile_tbl[1])
+        if(mb_per_sec <= (unsigned int)profile_tbl[1])
         {
-          if(m_sVenc_cfg.targetbitrate <= (int)profile_tbl[2])
+          if(m_sVenc_cfg.targetbitrate <= (unsigned int)profile_tbl[2])
           {
               new_level = (int)profile_tbl[3];
               new_profile = (int)profile_tbl[4];
@@ -3279,7 +3279,7 @@ bool venc_dev::venc_max_allowed_bitrate_check(OMX_U32 nTargetBitrate)
   }
   while(profile_tbl[0] != 0)
   {
-    if(profile_tbl[3] == m_eLevel)
+    if((int)profile_tbl[3] == m_eLevel)
     {
       if(nTargetBitrate > profile_tbl[2])
       {