diff options
author | Steve Kondik <steve@cyngn.com> | 2015-11-01 02:50:41 -0800 |
---|---|---|
committer | Skrilax_CZ <skrilax@gmail.com> | 2015-12-14 21:20:07 -0800 |
commit | e79efd8fa991c8a9f717c447728f46d7dc5937ca (patch) | |
tree | 06ad16a0aa4a5d0feae405f5a50e5dd0eeef6be6 | |
parent | ef9af05db59d198e76d735fcbb787813bcbf1ad4 (diff) | |
download | android_hardware_qcom_media-cm-14.0-caf-8084.tar.gz android_hardware_qcom_media-cm-14.0-caf-8084.tar.bz2 android_hardware_qcom_media-cm-14.0-caf-8084.zip |
media: Fix issues when building with Clangstaging/cm-14.0-caf-apq8084stable/cm-13.0-caf-8084-ZNH5Ystable/cm-13.0-caf-8084-ZNH2KBstable/cm-13.0-caf-8084-ZNH2Kstable/cm-13.0-caf-8084-ZNH0Ecm-14.0-caf-8084
* Pulled in from Google's fork
Change-Id: If1a690ac7a2c254afe444b617439ba9e893c2502
-rw-r--r-- | libc2dcolorconvert/C2DColorConverter.cpp | 4 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 3 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 2 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 7 |
4 files changed, 7 insertions, 9 deletions
diff --git a/libc2dcolorconvert/C2DColorConverter.cpp b/libc2dcolorconvert/C2DColorConverter.cpp index 0bc72bf5..f9b9fe48 100644 --- a/libc2dcolorconvert/C2DColorConverter.cpp +++ b/libc2dcolorconvert/C2DColorConverter.cpp @@ -319,7 +319,7 @@ C2D_STATUS C2DColorConverter::updateYUVSurfaceDef(int fd, void *base, void *data if (isSource) { C2D_YUV_SURFACE_DEF * srcSurfaceDef = (C2D_YUV_SURFACE_DEF *)mSrcSurfaceDef; srcSurfaceDef->plane0 = data; - srcSurfaceDef->phys0 = getMappedGPUAddr(fd, data, mSrcSize) + ((uint8_t *)data - (uint8_t *)base); + srcSurfaceDef->phys0 = (char*)getMappedGPUAddr(fd, data, mSrcSize) + ((uint8_t *)data - (uint8_t *)base); srcSurfaceDef->plane1 = (uint8_t *)data + mSrcYSize; srcSurfaceDef->phys1 = (uint8_t *)srcSurfaceDef->phys0 + mSrcYSize; srcSurfaceDef->plane2 = (uint8_t *)srcSurfaceDef->plane1 + mSrcYSize/4; @@ -331,7 +331,7 @@ C2D_STATUS C2DColorConverter::updateYUVSurfaceDef(int fd, void *base, void *data } else { C2D_YUV_SURFACE_DEF * dstSurfaceDef = (C2D_YUV_SURFACE_DEF *)mDstSurfaceDef; dstSurfaceDef->plane0 = data; - dstSurfaceDef->phys0 = getMappedGPUAddr(fd, data, mDstSize) + ((uint8_t *)data - (uint8_t *)base); + dstSurfaceDef->phys0 = (char*)getMappedGPUAddr(fd, data, mDstSize) + ((uint8_t *)data - (uint8_t *)base); dstSurfaceDef->plane1 = (uint8_t *)data + mDstYSize; dstSurfaceDef->phys1 = (uint8_t *)dstSurfaceDef->phys0 + mDstYSize; dstSurfaceDef->plane2 = (uint8_t *)dstSurfaceDef->plane1 + mDstYSize/4; diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index ed6b3470..558b773d 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -169,6 +169,9 @@ LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp LOCAL_SRC_FILES += ../common/src/vidc_color_converter.cpp LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +# omx_vdec_msm8974.cpp:9462:16: address of array 'extra->data' will always evaluate to 'true' +LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion + include $(BUILD_SHARED_LIBRARY) 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 b74ce832..d6849903 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -8521,7 +8521,7 @@ OMX_ERRORTYPE omx_vdec::allocate_output_headers() sizeof(OMX_BUFFERHEADERTYPE), nPMEMInfoSize, nPlatformListSize); - DEBUG_PRINT_LOW("PE %d bmSize %"PRId64, nPlatformEntrySize, + DEBUG_PRINT_LOW("PE %d bmSize %" PRId64, nPlatformEntrySize, m_out_bm_count); m_out_mem_ptr = (OMX_BUFFERHEADERTYPE *)calloc(nBufHdrSize,1); // Alloc mem for platform specific info 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 dfbfd4f5..1cb2ddb8 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1603,12 +1603,7 @@ OMX_ERRORTYPE omx_video::get_parameter(OMX_IN OMX_HANDLETYPE hComp, comp_role->nSize = sizeof(*comp_role); DEBUG_PRINT_LOW("Getparameter: OMX_IndexParamStandardComponentRole %d",paramIndex); - if (NULL != comp_role->cRole) { - strlcpy((char*)comp_role->cRole,(const char*)m_cRole,OMX_MAX_STRINGNAME_SIZE); - } else { - DEBUG_PRINT_ERROR("ERROR: Getparameter: OMX_IndexParamStandardComponentRole %d is passed with NULL parameter for role",paramIndex); - eRet =OMX_ErrorBadParameter; - } + strlcpy((char*)comp_role->cRole,(const char*)m_cRole,OMX_MAX_STRINGNAME_SIZE); break; } /* Added for parameter test */ |