Merge "mm-video-v4l2: vidc: Enable compilation of mm-video-v4l2 in 64 bit mode"

6 files changed, 71 insertions, 72 deletions

diff --git a/Android.mk b/Android.mk
index c675cd3b..0f295b3a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,9 +3,6 @@ ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf ap
 include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
 endif
 
-ifneq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
-    $(info TODOAArch64: $(LOCAL_PATH)/Android.mk: Enable compile for 64 bit)
-else
 ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7627a msm7630_surf apq8084 mpq8092 msm_bronze msm8916 msm8994,$(TARGET_BOARD_PLATFORM)),)
 include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
 endif
@@ -21,4 +18,3 @@ endif
 ifneq ($(filter apq8084,$(TARGET_BOARD_PLATFORM)),)
 include $(QCOM_MEDIA_ROOT)/videopp/Android.mk
 endif
-endif # TARGET_ARCH
diff --git a/mm-video-v4l2/vidc/test/Android.mk b/mm-video-v4l2/vidc/test/Android.mk
index ca904b7e..57e13e78 100644
--- a/mm-video-v4l2/vidc/test/Android.mk
+++ b/mm-video-v4l2/vidc/test/Android.mk
@@ -10,4 +10,5 @@ LOCAL_SRC_FILES               += queue.c
 LOCAL_SRC_FILES               += ring_queue.c
 LOCAL_CFLAGS                  := -DLOG_TAG=\"MSM-VIDC-TEST\"
 LOCAL_MODULE_TAGS             := optional
+LOCAL_32_BIT_ONLY             := true
 include $(BUILD_EXECUTABLE)
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 484b3206..af5fc6ff 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -1,10 +1,8 @@
 ifneq ($(BUILD_TINY_ANDROID),true)
 
-ROOT_DIR := $(call my-dir)
-OMX_VIDEO_PATH := $(ROOT_DIR)/../..
-
+LOCAL_PATH := $(call my-dir)
+OMX_VIDEO_PATH := $(TOP)/hardware/qcom/media/mm-video-v4l2
 include $(CLEAR_VARS)
-LOCAL_PATH:= $(ROOT_DIR)
 
 # ---------------------------------------------------------------------------------
 # 				Common definitons
@@ -116,25 +114,24 @@ vdec-inc          = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 # ---------------------------------------------------------------------------------
 
 include $(CLEAR_VARS)
-LOCAL_PATH:= $(ROOT_DIR)
 
 libmm-vdec-inc          += $(LOCAL_PATH)/inc 
 libmm-vdec-inc          += $(OMX_VIDEO_PATH)/vidc/common/inc
-libmm-vdec-inc          += hardware/qcom/media/mm-core/inc
+libmm-vdec-inc          += $(TOP)/hardware/qcom/media/mm-core/inc
 #DRM include - Interface which loads the DRM library
 libmm-vdec-inc	        += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc
 libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/qcom/display
 libmm-vdec-inc          += $(TARGET_OUT_HEADERS)/adreno
-libmm-vdec-inc          += frameworks/native/include/media/openmax
-libmm-vdec-inc          += frameworks/native/include/media/hardware
+libmm-vdec-inc          += $(TOP)/frameworks/native/include/media/openmax
+libmm-vdec-inc          += $(TOP)/frameworks/native/include/media/hardware
 libmm-vdec-inc          += $(vdec-inc)
-libmm-vdec-inc      += hardware/qcom/media/libc2dcolorconvert
-libmm-vdec-inc      += frameworks/av/include/media/stagefright
+libmm-vdec-inc      += $(TOP)/hardware/qcom/media/libc2dcolorconvert
+libmm-vdec-inc      += $(TOP)/frameworks/av/include/media/stagefright
 libmm-vdec-inc      += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
 
 ifeq ($(PLATFORM_SDK_VERSION), 18)  #JB_MR2
 libOmxVdec-def += -DANDROID_JELLYBEAN_MR2=1
-libmm-vdec-inc += hardware/qcom/media/libstagefrighthw
+libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw
 endif
 
 ifeq ($(call is-platform-sdk-version-at-least, 19),true)
@@ -179,12 +176,12 @@ include $(BUILD_SHARED_LIBRARY)
 # ---------------------------------------------------------------------------------
 
 include $(CLEAR_VARS)
-LOCAL_PATH:= $(ROOT_DIR)
 
 # libOmxVdecHevc library is not built for OSS builds as QCPATH is null in OSS builds.
 
 ifneq "$(wildcard $(QCPATH) )" ""
 ifneq (,$(filter msm8974 msm8610 msm8226 msm_bronze msm8916,$(TARGET_BOARD_PLATFORM)))
+ifeq (,$(filter aarch64 arm64, $(TARGET_ARCH)))
 
 LOCAL_MODULE                    := libOmxVdecHevc
 LOCAL_ADDITIONAL_DEPENDENCIES   := libOmxVenc
@@ -220,13 +217,14 @@ include $(BUILD_SHARED_LIBRARY)
 
 endif
 endif
+endif
 
 # ---------------------------------------------------------------------------------
 # 			Make the apps-test (mm-vdec-omx-test)
 # ---------------------------------------------------------------------------------
 include $(CLEAR_VARS)
 
-mm-vdec-test-inc    := hardware/qcom/media/mm-core/inc
+mm-vdec-test-inc    := $(TOP)/hardware/qcom/media/mm-core/inc
 mm-vdec-test-inc    += $(LOCAL_PATH)/inc
 mm-vdec-test-inc    += $(vdec-inc)
 
@@ -241,7 +239,7 @@ LOCAL_SHARED_LIBRARIES    := libutils libOmxCore libOmxVdec libbinder libcutils
 LOCAL_SRC_FILES           := src/queue.c
 LOCAL_SRC_FILES           += test/omx_vdec_test.cpp
 LOCAL_ADDITIONAL_DEPENDENCIES  := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
+LOCAL_32_BIT_ONLY         := true
 include $(BUILD_EXECUTABLE)
 
 # ---------------------------------------------------------------------------------
@@ -249,7 +247,7 @@ include $(BUILD_EXECUTABLE)
 # ---------------------------------------------------------------------------------
 include $(CLEAR_VARS)
 
-mm-vdec-drv-test-inc    := hardware/qcom/media/mm-core/inc
+mm-vdec-drv-test-inc    := $(TOP)/hardware/qcom/media/mm-core/inc
 mm-vdec-drv-test-inc    += $(LOCAL_PATH)/inc
 mm-vdec-drv-test-inc    += $(vdec-inc)
 
diff --git a/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp b/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp
index e21d7163..13d4eac0 100644
--- a/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp
@@ -1292,7 +1292,7 @@ void h264_stream_parser::get_frame_rate(OMX_U32 *frame_rate)
 void h264_stream_parser::parse_nal(OMX_U8* data_ptr, OMX_U32 data_len, OMX_U32 nal_type, bool enable_emu_sc)
 {
     OMX_U32 nal_unit_type = NALU_TYPE_UNSPECIFIED, cons_bytes = 0;
-    ALOGV("parse_nal(): IN nal_type(%lu)", nal_type);
+    ALOGV("parse_nal(): IN nal_type(%u)", nal_type);
     if (!data_len)
         return;
     init_bitstream(data_ptr, data_len);
@@ -1320,7 +1320,7 @@ void h264_stream_parser::parse_nal(OMX_U8* data_ptr, OMX_U32 data_len, OMX_U32 n
             parse_vui(true);
             break;
         default:
-            ALOGV("nal_unit_type received : %lu", nal_type);
+            ALOGV("nal_unit_type received : %u", nal_type);
     }
     ALOGV("parse_nal(): OUT");
 }
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index 6105b2ad..7f3e925d 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -581,7 +581,7 @@ omx_vdec::omx_vdec(): m_error_propogated(false),
     m_queued_codec_config_count(0)
 {
     /* Assumption is that , to begin with , we have all the frames with decoder */
-    DEBUG_PRINT_HIGH("In %d bit OMX vdec Constructor", sizeof(long) * 8);
+    DEBUG_PRINT_HIGH("In %u bit OMX vdec Constructor", (unsigned int)sizeof(long) * 8);
     memset(&m_debug,0,sizeof(m_debug));
 #ifdef _ANDROID_
     char property_value[PROPERTY_VALUE_MAX] = {0};
@@ -1858,7 +1858,7 @@ OMX_ERRORTYPE omx_vdec::component_init(OMX_STRING role)
                 enable_extradata(DEFAULT_EXTRADATA, true, true);
 #endif
         eRet = get_buffer_req(&drv_ctx.ip_buf);
-        DEBUG_PRINT_HIGH("Input Buffer Size =%d",drv_ctx.ip_buf.buffer_size);
+        DEBUG_PRINT_HIGH("Input Buffer Size =%u",(unsigned int)drv_ctx.ip_buf.buffer_size);
         get_buffer_req(&drv_ctx.op_buf);
         if (drv_ctx.decoder_format == VDEC_CODECTYPE_H264 ||
                 drv_ctx.decoder_format == VDEC_CODECTYPE_HEVC ||
@@ -3176,7 +3176,7 @@ OMX_ERRORTYPE  omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE     hComp,
                                                m_port_def = *portDefn;
                                        } else {
                                            DEBUG_PRINT_ERROR("ERROR: OP Requirements(#%d: %u) Requested(#%u: %u)",
-                                                   drv_ctx.op_buf.mincount, drv_ctx.op_buf.buffer_size,
+                                                   drv_ctx.op_buf.mincount, (unsigned int)drv_ctx.op_buf.buffer_size,
                                                    (unsigned int)portDefn->nBufferCountActual, (unsigned int)portDefn->nBufferSize);
                                            eRet = OMX_ErrorBadParameter;
                                        }
@@ -3276,7 +3276,7 @@ OMX_ERRORTYPE  omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE     hComp,
                                    }
                                    if (false == port_format_changed) {
                                        DEBUG_PRINT_ERROR("ERROR: IP Requirements(#%d: %u) Requested(#%u: %u)",
-                                               drv_ctx.ip_buf.mincount, drv_ctx.ip_buf.buffer_size,
+                                               drv_ctx.ip_buf.mincount, (unsigned int)drv_ctx.ip_buf.buffer_size,
                                                (unsigned int)portDefn->nBufferCountActual, (unsigned int)portDefn->nBufferSize);
                                        eRet = OMX_ErrorBadParameter;
                                    }
@@ -4389,7 +4389,7 @@ OMX_ERRORTYPE  omx_vdec::use_output_buffer(
             if ((OMX_U32)handle->size < drv_ctx.op_buf.buffer_size) {
                 DEBUG_PRINT_ERROR("Insufficient sized buffer given for playback,"
                         " expected %u, got %u",
-                        drv_ctx.op_buf.buffer_size, (unsigned int)handle->size);
+                        (unsigned int)drv_ctx.op_buf.buffer_size, (unsigned int)handle->size);
                 return OMX_ErrorBadParameter;
             }
 
@@ -4736,8 +4736,8 @@ OMX_ERRORTYPE omx_vdec::free_input_buffer(OMX_BUFFERHEADERTYPE *bufferHdr)
             if (!secure_mode) {
                 DEBUG_PRINT_LOW("unmap the input buffer fd=%d",
                         drv_ctx.ptr_inputbuffer[index].pmem_fd);
-                DEBUG_PRINT_LOW("unmap the input buffer size=%d  address = %p",
-                        drv_ctx.ptr_inputbuffer[index].mmaped_size,
+                DEBUG_PRINT_LOW("unmap the input buffer size=%u  address = %p",
+                        (unsigned int)drv_ctx.ptr_inputbuffer[index].mmaped_size,
                         drv_ctx.ptr_inputbuffer[index].bufferaddr);
                 munmap (drv_ctx.ptr_inputbuffer[index].bufferaddr,
                         drv_ctx.ptr_inputbuffer[index].mmaped_size);
@@ -4795,8 +4795,8 @@ OMX_ERRORTYPE omx_vdec::free_output_buffer(OMX_BUFFERHEADERTYPE *bufferHdr)
                     if (!secure_mode) {
                         DEBUG_PRINT_LOW("unmap the output buffer fd = %d",
                                 drv_ctx.ptr_outputbuffer[0].pmem_fd);
-                        DEBUG_PRINT_LOW("unmap the ouput buffer size=%d  address = %p",
-                                drv_ctx.ptr_outputbuffer[0].mmaped_size * drv_ctx.op_buf.actualcount,
+                        DEBUG_PRINT_LOW("unmap the ouput buffer size=%u  address = %p",
+                                (unsigned int)drv_ctx.ptr_outputbuffer[0].mmaped_size * drv_ctx.op_buf.actualcount,
                                 drv_ctx.ptr_outputbuffer[0].bufferaddr);
                         munmap (drv_ctx.ptr_outputbuffer[0].bufferaddr,
                                 drv_ctx.ptr_outputbuffer[0].mmaped_size * drv_ctx.op_buf.actualcount);
@@ -4926,15 +4926,15 @@ OMX_ERRORTYPE  omx_vdec::allocate_input_buffer(
 
 
     if (bytes != drv_ctx.ip_buf.buffer_size) {
-        DEBUG_PRINT_LOW("Requested Size is wrong %u epected is %d",
-                (unsigned int)bytes, drv_ctx.ip_buf.buffer_size);
+        DEBUG_PRINT_LOW("Requested Size is wrong %u epected is %u",
+                (unsigned int)bytes, (unsigned int)drv_ctx.ip_buf.buffer_size);
         return OMX_ErrorBadParameter;
     }
 
     if (!m_inp_mem_ptr) {
-        DEBUG_PRINT_HIGH("Allocate i/p buffer Header: Cnt(%d) Sz(%d)",
+        DEBUG_PRINT_HIGH("Allocate i/p buffer Header: Cnt(%d) Sz(%u)",
                 drv_ctx.ip_buf.actualcount,
-                drv_ctx.ip_buf.buffer_size);
+                (unsigned int)drv_ctx.ip_buf.buffer_size);
 
         m_inp_mem_ptr = (OMX_BUFFERHEADERTYPE*) \
                 calloc( (sizeof(OMX_BUFFERHEADERTYPE)), drv_ctx.ip_buf.actualcount);
@@ -5118,9 +5118,9 @@ OMX_ERRORTYPE  omx_vdec::allocate_output_buffer(
     struct ion_fd_data fd_ion_data;
 #endif
     if (!m_out_mem_ptr) {
-        DEBUG_PRINT_HIGH("Allocate o/p buffer Header: Cnt(%d) Sz(%d)",
+        DEBUG_PRINT_HIGH("Allocate o/p buffer Header: Cnt(%d) Sz(%u)",
                 drv_ctx.op_buf.actualcount,
-                drv_ctx.op_buf.buffer_size);
+                (unsigned int)drv_ctx.op_buf.buffer_size);
         int nBufHdrSize        = 0;
         int nPlatformEntrySize = 0;
         int nPlatformListSize  = 0;
@@ -5144,8 +5144,8 @@ OMX_ERRORTYPE  omx_vdec::allocate_output_buffer(
         nPlatformEntrySize = drv_ctx.op_buf.actualcount *
             sizeof(OMX_QCOM_PLATFORM_PRIVATE_ENTRY);
 
-        DEBUG_PRINT_LOW("TotalBufHdr %d BufHdrSize %d PMEM %d PL %d",nBufHdrSize,
-                sizeof(OMX_BUFFERHEADERTYPE),
+        DEBUG_PRINT_LOW("TotalBufHdr %d BufHdrSize %u PMEM %d PL %d",nBufHdrSize,
+                (unsigned int)sizeof(OMX_BUFFERHEADERTYPE),
                 nPMEMInfoSize,
                 nPlatformListSize);
         DEBUG_PRINT_LOW("PE %d OutputBuffer Count %d",nPlatformEntrySize,
@@ -5192,8 +5192,8 @@ OMX_ERRORTYPE  omx_vdec::allocate_output_buffer(
                      drv_ctx.op_buf.actualcount),
                     PROT_READ|PROT_WRITE,MAP_SHARED,pmem_fd,0);
             if (pmem_baseaddress == MAP_FAILED) {
-                DEBUG_PRINT_ERROR("MMAP failed for Size %d",
-                        drv_ctx.op_buf.buffer_size);
+                DEBUG_PRINT_ERROR("MMAP failed for Size %u",
+                        (unsigned int)drv_ctx.op_buf.buffer_size);
                 close(pmem_fd);
 #ifdef USE_ION
                 free_ion_memory(&drv_ctx.op_buf_ion_info[i]);
@@ -5290,8 +5290,8 @@ OMX_ERRORTYPE  omx_vdec::allocate_output_buffer(
                 m_pmem_info[i].mapped_size = drv_ctx.ptr_outputbuffer[i].mmaped_size;
                 m_pmem_info[i].buffer = drv_ctx.ptr_outputbuffer[i].bufferaddr;
 
-                DEBUG_PRINT_LOW("pmem_fd = %d offset = %d address = %p",
-                        pmem_fd, drv_ctx.ptr_outputbuffer[i].offset,
+                DEBUG_PRINT_LOW("pmem_fd = %d offset = %u address = %p",
+                        pmem_fd, (unsigned int)drv_ctx.ptr_outputbuffer[i].offset,
                         drv_ctx.ptr_outputbuffer[i].bufferaddr);
                 // Move the buffer and buffer header pointers
                 bufHdr++;
@@ -5352,7 +5352,7 @@ OMX_ERRORTYPE  omx_vdec::allocate_output_buffer(
             if (secure_mode) {
 #ifdef USE_ION
                 drv_ctx.ptr_outputbuffer[i].bufferaddr =
-                    (OMX_U8 *)drv_ctx.op_buf_ion_info[i].fd_ion_data.fd;
+                    (OMX_U8 *)(intptr_t)drv_ctx.op_buf_ion_info[i].fd_ion_data.fd;
 #else
                 drv_ctx.ptr_outputbuffer[i].bufferaddr = *bufferHdr;
 #endif
@@ -5987,8 +5987,9 @@ if (buffer->nFlags & QOMX_VIDEO_BUFFERFLAG_EOSEQ) {
             return OMX_ErrorBadParameter;
         }
     }
-    DEBUG_PRINT_LOW("[ETBP] pBuf(%p) nTS(%lld) Sz(%d)",
-            frameinfo.bufferaddr, frameinfo.timestamp, frameinfo.datalen);
+    DEBUG_PRINT_LOW("[ETBP] pBuf(%p) nTS(%lld) Sz(%u)",
+            frameinfo.bufferaddr, (long long)frameinfo.timestamp,
+            (unsigned int)frameinfo.datalen);
     time_stamp_dts.insert_timestamp(buffer);
 
     return ret;
@@ -7099,16 +7100,16 @@ int omx_vdec::async_message_process (void *context, void* message)
                 omx->post_event ((unsigned long)timestamp, vdec_msg->status_code,
                         OMX_COMPONENT_GENERATE_INFO_FIELD_DROPPED);
                 DEBUG_PRINT_HIGH("Field dropped time stamp is %lld",
-                        vdec_msg->msgdata.output_frame.time_stamp);
+                        (long long)vdec_msg->msgdata.output_frame.time_stamp);
             }
             break;
         case VDEC_MSG_RESP_OUTPUT_FLUSHED:
         case VDEC_MSG_RESP_OUTPUT_BUFFER_DONE:
 
             v4l2_buf_ptr = (v4l2_buffer*)vdec_msg->msgdata.output_frame.client_data;
-            omxhdr=omx->m_out_mem_ptr+v4l2_buf_ptr->index;
+            omxhdr = omx->m_out_mem_ptr+v4l2_buf_ptr->index;
             DEBUG_PRINT_LOW("[RespBufDone] Buf(%p) Ts(%lld) Pic_type(%u)",
-                    omxhdr, vdec_msg->msgdata.output_frame.time_stamp,
+                    omxhdr, (long long)vdec_msg->msgdata.output_frame.time_stamp,
                     vdec_msg->msgdata.output_frame.pic_type);
 
             if (omxhdr && omxhdr->pOutputPortPrivate &&
@@ -8203,8 +8204,8 @@ OMX_ERRORTYPE omx_vdec::get_buffer_req(vdec_allocatorproperty *buffer_prop)
     unsigned int final_extra_data_size = 0;
     struct v4l2_format fmt;
     int ret = 0;
-    DEBUG_PRINT_LOW("GetBufReq IN: ActCnt(%d) Size(%d)",
-            buffer_prop->actualcount, buffer_prop->buffer_size);
+    DEBUG_PRINT_LOW("GetBufReq IN: ActCnt(%d) Size(%u)",
+            buffer_prop->actualcount, (unsigned int)buffer_prop->buffer_size);
     bufreq.memory = V4L2_MEMORY_USERPTR;
     bufreq.count = 1;
     if (buffer_prop->buffer_type == VDEC_BUFFER_TYPE_INPUT) {
@@ -8231,8 +8232,8 @@ OMX_ERRORTYPE omx_vdec::get_buffer_req(vdec_allocatorproperty *buffer_prop)
         buffer_prop->mincount = bufreq.count;
         DEBUG_PRINT_HIGH("Count = %d",bufreq.count);
     }
-    DEBUG_PRINT_LOW("GetBufReq IN: ActCnt(%d) Size(%d)",
-            buffer_prop->actualcount, buffer_prop->buffer_size);
+    DEBUG_PRINT_LOW("GetBufReq IN: ActCnt(%d) Size(%u)",
+            buffer_prop->actualcount, (unsigned int)buffer_prop->buffer_size);
 
     fmt.fmt.pix_mp.height = drv_ctx.video_resolution.frame_height;
     fmt.fmt.pix_mp.width = drv_ctx.video_resolution.frame_width;
@@ -8281,8 +8282,8 @@ OMX_ERRORTYPE omx_vdec::get_buffer_req(vdec_allocatorproperty *buffer_prop)
         drv_ctx.extradata_info.count = buffer_prop->actualcount;
         drv_ctx.extradata_info.buffer_size = final_extra_data_size;
         buf_size = (buf_size + buffer_prop->alignment - 1)&(~(buffer_prop->alignment - 1));
-        DEBUG_PRINT_LOW("GetBufReq UPDATE: ActCnt(%d) Size(%d) BufSize(%d)",
-                buffer_prop->actualcount, buffer_prop->buffer_size, buf_size);
+        DEBUG_PRINT_LOW("GetBufReq UPDATE: ActCnt(%d) Size(%u) BufSize(%d)",
+                buffer_prop->actualcount, (unsigned int)buffer_prop->buffer_size, buf_size);
         if (extra_data_size)
             DEBUG_PRINT_LOW("GetBufReq UPDATE: extradata: TotalSize(%d) BufferSize(%lu)",
                 drv_ctx.extradata_info.size, drv_ctx.extradata_info.buffer_size);
@@ -8294,8 +8295,8 @@ OMX_ERRORTYPE omx_vdec::get_buffer_req(vdec_allocatorproperty *buffer_prop)
             eRet = set_buffer_req(buffer_prop);
         }
     }
-    DEBUG_PRINT_LOW("GetBufReq OUT: ActCnt(%d) Size(%d)",
-            buffer_prop->actualcount, buffer_prop->buffer_size);
+    DEBUG_PRINT_LOW("GetBufReq OUT: ActCnt(%d) Size(%u)",
+            buffer_prop->actualcount, (unsigned int)buffer_prop->buffer_size);
     return eRet;
 }
 
@@ -8306,12 +8307,12 @@ OMX_ERRORTYPE omx_vdec::set_buffer_req(vdec_allocatorproperty *buffer_prop)
     struct v4l2_format fmt;
     struct v4l2_requestbuffers bufreq;
     int ret;
-    DEBUG_PRINT_LOW("SetBufReq IN: ActCnt(%d) Size(%d)",
-            buffer_prop->actualcount, buffer_prop->buffer_size);
+    DEBUG_PRINT_LOW("SetBufReq IN: ActCnt(%d) Size(%u)",
+            buffer_prop->actualcount, (unsigned int)buffer_prop->buffer_size);
     buf_size = (buffer_prop->buffer_size + buffer_prop->alignment - 1)&(~(buffer_prop->alignment - 1));
     if (buf_size != buffer_prop->buffer_size) {
-        DEBUG_PRINT_ERROR("Buffer size alignment error: Requested(%d) Required(%d)",
-                buffer_prop->buffer_size, buf_size);
+        DEBUG_PRINT_ERROR("Buffer size alignment error: Requested(%u) Required(%d)",
+                (unsigned int)buffer_prop->buffer_size, buf_size);
         eRet = OMX_ErrorBadParameter;
     } else {
         fmt.fmt.pix_mp.height = drv_ctx.video_resolution.frame_height;
@@ -8500,8 +8501,8 @@ OMX_ERRORTYPE omx_vdec::allocate_output_headers()
         nPlatformEntrySize = drv_ctx.op_buf.actualcount *
             sizeof(OMX_QCOM_PLATFORM_PRIVATE_ENTRY);
 
-        DEBUG_PRINT_LOW("TotalBufHdr %d BufHdrSize %d PMEM %d PL %d",nBufHdrSize,
-                sizeof(OMX_BUFFERHEADERTYPE),
+        DEBUG_PRINT_LOW("TotalBufHdr %d BufHdrSize %u PMEM %d PL %d",nBufHdrSize,
+                (unsigned int)sizeof(OMX_BUFFERHEADERTYPE),
                 nPMEMInfoSize,
                 nPlatformListSize);
         DEBUG_PRINT_LOW("PE %d bmSize %d",nPlatformEntrySize,
@@ -9687,8 +9688,9 @@ bool omx_vdec::allocate_color_convert_buf::update_buffer_req()
         if (!src_size || src_size > omx->drv_ctx.op_buf.buffer_size ||
                 !destination_size) {
             DEBUG_PRINT_ERROR("ERROR: Size mismatch in C2D src_size %d"
-                    "driver size %d destination size %d",
-                    src_size,omx->drv_ctx.op_buf.buffer_size,destination_size);
+                    "driver size %u destination size %d",
+                    src_size, (unsigned int)omx->drv_ctx.op_buf.buffer_size,
+                    destination_size);
             status = false;
             c2d.close();
             buffer_size_req = 0;
@@ -9915,8 +9917,8 @@ OMX_ERRORTYPE omx_vdec::allocate_color_convert_buf::allocate_buffers_color_conve
     }
     if ((temp_bufferHdr - omx->m_out_mem_ptr) >=
             (int)omx->drv_ctx.op_buf.actualcount) {
-        DEBUG_PRINT_ERROR("Invalid header index %d",
-                (temp_bufferHdr - omx->m_out_mem_ptr));
+        DEBUG_PRINT_ERROR("Invalid header index %ld",
+               (long int)(temp_bufferHdr - omx->m_out_mem_ptr));
         return OMX_ErrorUndefined;
     }
     unsigned int i = allocated_count;
@@ -10229,7 +10231,7 @@ OMX_ERRORTYPE omx_vdec::enable_adaptive_playback(unsigned long nMaxFrameWidth,
          return eRet;
      }
      DEBUG_PRINT_LOW("enable adaptive - upper limit buffer size = %u",
-                     drv_ctx.op_buf.buffer_size);
+                     (unsigned int)drv_ctx.op_buf.buffer_size);
 
      drv_ctx.op_buf.mincount = min_res_buf_count;
      drv_ctx.op_buf.actualcount = min_res_buf_count;
@@ -10245,6 +10247,6 @@ OMX_ERRORTYPE omx_vdec::enable_adaptive_playback(unsigned long nMaxFrameWidth,
          return eRet;
      }
      DEBUG_PRINT_HIGH("adaptive playback enabled, buf count = %u bufsize = %u",
-                      drv_ctx.op_buf.mincount, drv_ctx.op_buf.buffer_size);
+                      drv_ctx.op_buf.mincount, (unsigned int)drv_ctx.op_buf.buffer_size);
      return eRet;
 }
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
index f80ef0a7..7b4d0418 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
@@ -4275,8 +4275,9 @@ int omx_video::alloc_map_ion_memory(int size,
         alloc_data->align = SZ_1M;
         alloc_data->flags = ION_SECURE;
         alloc_data->heap_id_mask = ION_HEAP(ION_CP_MM_HEAP_ID);
-        DEBUG_PRINT_HIGH("ION ALLOC sec buf: size %d align %d flags %x",
-                alloc_data->len, alloc_data->align,alloc_data->flags);
+        DEBUG_PRINT_HIGH("ION ALLOC sec buf: size %u align %u flags %x",
+                (unsigned int)alloc_data->len, (unsigned int)alloc_data->align,
+                alloc_data->flags);
     } else {
         alloc_data->len = (size + (SZ_4K - 1)) & ~(SZ_4K - 1);
         alloc_data->align = SZ_4K;
@@ -4287,8 +4288,9 @@ int omx_video::alloc_map_ion_memory(int size,
         alloc_data->heap_id_mask = (ION_HEAP(MEM_HEAP_ID) |
                                  ION_HEAP(ION_IOMMU_HEAP_ID));
 #endif
-        DEBUG_PRINT_HIGH("ION ALLOC unsec buf: size %d align %d flags %x",
-                alloc_data->len, alloc_data->align,alloc_data->flags);
+        DEBUG_PRINT_HIGH("ION ALLOC unsec buf: size %u align %u flags %x",
+                (unsigned int)alloc_data->len, (unsigned int)alloc_data->align,
+                alloc_data->flags);
     }
 
     rc = ioctl(ion_device_fd,ION_IOC_ALLOC,alloc_data);