From 4fac31938cbdbca39a41efe3863159427efc7dae Mon Sep 17 00:00:00 2001 From: Vijay Venkatraman Date: Tue, 7 Feb 2017 18:40:54 +0000 Subject: Revert "Replacing LOCAL_COPY_HEADERS with LOCAL_EXPORT_C_INCLUDE_DIRS, for VNDK" This reverts commit 7bbd6afa54e361119c348c96eada150d998b3246. Change-Id: I5b2aad573ea6e8048e6e1f25bc0026d23ede9f2a --- msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk | 9 ++-- .../DivxDrmDecrypt/inc/DivXDrmDecrypt.h | 49 ++++++++++++++++++++++ .../mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h | 49 ---------------------- msm8974/mm-video-v4l2/vidc/vdec.mk | 11 +++-- msm8974/mm-video-v4l2/vidc/venc.mk | 8 +++- 5 files changed, 67 insertions(+), 59 deletions(-) create mode 100755 msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h delete mode 100755 msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h (limited to 'msm8974/mm-video-v4l2') diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk index 735430f..28f5072 100755 --- a/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk +++ b/msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk @@ -5,6 +5,8 @@ include $(CLEAR_VARS) # Deploy the headers that can be exposed #=============================================================================== +LOCAL_COPY_HEADERS_TO := mm-video-v4l2/DivxDrmDecrypt +LOCAL_COPY_HEADERS := inc/DivXDrmDecrypt.h LOCAL_CFLAGS := \ -D_ANDROID_ @@ -13,15 +15,14 @@ LOCAL_SRC_FILES:= \ src/DivXDrmDecrypt.cpp LOCAL_C_INCLUDES:= \ - $(LOCAL_PATH)/inc/mm-video-v4l2/DivxDrmDecrypt \ + $(LOCAL_PATH)/inc \ + $(TARGET_OUT_HEADERS)/mm-core/omxcore LOCAL_MODULE:= libdivxdrmdecrypt LOCAL_MODULE_TAGS := optional -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc - -LOCAL_SHARED_LIBRARIES := liblog libdl libOmxCore +LOCAL_SHARED_LIBRARIES := liblog libdl LOCAL_LDLIBS += include $(BUILD_SHARED_LIBRARY) diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h new file mode 100755 index 0000000..d24c4dc --- /dev/null +++ b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h @@ -0,0 +1,49 @@ +/*-------------------------------------------------------------------------- +Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of The Linux Foundation nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------*/ + +#ifndef __DIVXDRMDECRYPT_H__ +#define __DIVXDRMDECRYPT_H__ + +#include + +//Abstract base class of API to decrypt DRM content. +class DivXDrmDecrypt +{ + public: + static DivXDrmDecrypt* Create(); + virtual OMX_ERRORTYPE Init() = 0; + virtual OMX_ERRORTYPE Decrypt(OMX_BUFFERHEADERTYPE* buffer) = 0; + inline virtual ~DivXDrmDecrypt() {} +}; + +//.so file should provide a function with the name createDivXDrmDecrypt with +//prototype of DivXDrmDecryptFactory. +static const char* MEDIA_CREATE_DIVX_DRM_DECRYPT = "createDivXDrmDecrypt"; +typedef DivXDrmDecrypt* (*DivXDrmDecryptFactory)(); + +#endif //__DIVXDRMDECRYPT_H__ diff --git a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h b/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h deleted file mode 100755 index d24c4dc..0000000 --- a/msm8974/mm-video-v4l2/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/DivXDrmDecrypt.h +++ /dev/null @@ -1,49 +0,0 @@ -/*-------------------------------------------------------------------------- -Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of The Linux Foundation nor - the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------------*/ - -#ifndef __DIVXDRMDECRYPT_H__ -#define __DIVXDRMDECRYPT_H__ - -#include - -//Abstract base class of API to decrypt DRM content. -class DivXDrmDecrypt -{ - public: - static DivXDrmDecrypt* Create(); - virtual OMX_ERRORTYPE Init() = 0; - virtual OMX_ERRORTYPE Decrypt(OMX_BUFFERHEADERTYPE* buffer) = 0; - inline virtual ~DivXDrmDecrypt() {} -}; - -//.so file should provide a function with the name createDivXDrmDecrypt with -//prototype of DivXDrmDecryptFactory. -static const char* MEDIA_CREATE_DIVX_DRM_DECRYPT = "createDivXDrmDecrypt"; -typedef DivXDrmDecrypt* (*DivXDrmDecryptFactory)(); - -#endif //__DIVXDRMDECRYPT_H__ diff --git a/msm8974/mm-video-v4l2/vidc/vdec.mk b/msm8974/mm-video-v4l2/vidc/vdec.mk index 6e9f641..f6f2f24 100644 --- a/msm8974/mm-video-v4l2/vidc/vdec.mk +++ b/msm8974/mm-video-v4l2/vidc/vdec.mk @@ -97,8 +97,12 @@ LOCAL_PATH:= $(ROOT_DIR) libmm-vdec-inc := $(LOCAL_PATH)/vdec/inc libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-vdec-inc += hardware/qcom/media/msm8974/mm-core/inc #DRM include - Interface which loads the DRM library -libmm-vdec-inc += $(OMX_VIDEO_PATH)/DivxDrmDecrypt/inc/mm-video-v4l2/DivxDrmDecrypt/ +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 += $(vdec-inc) libmm-vdec-inc += hardware/qcom/media/msm8974/libc2dcolorconvert @@ -113,7 +117,7 @@ LOCAL_C_INCLUDES += $(libmm-vdec-inc) LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt -LOCAL_SHARED_LIBRARIES += libqdMetaData libstagefrighthw libOmxCore +LOCAL_SHARED_LIBRARIES += libqdMetaData LOCAL_SRC_FILES := vdec/src/frameparser.cpp LOCAL_SRC_FILES += vdec/src/h264_utils.cpp @@ -124,7 +128,7 @@ ifneq ($(filter msm8974 msm8610 msm8226 msm8084 msm8952 msm8992 msm8994,$(TARGET LOCAL_SRC_FILES += vdec/src/omx_vdec_msm8974.cpp else LOCAL_SHARED_LIBRARIES += libhardware -LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) +libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display LOCAL_SRC_FILES += vdec/src/power_module.cpp LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp endif @@ -156,7 +160,6 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl LOCAL_SHARED_LIBRARIES += libdivxdrmdecrypt LOCAL_SHARED_LIBRARIES += libqdMetaData -LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) LOCAL_SRC_FILES := vdec/src/frameparser.cpp LOCAL_SRC_FILES += vdec/src/h264_utils.cpp diff --git a/msm8974/mm-video-v4l2/vidc/venc.mk b/msm8974/mm-video-v4l2/vidc/venc.mk index 50bd742..f019bc2 100644 --- a/msm8974/mm-video-v4l2/vidc/venc.mk +++ b/msm8974/mm-video-v4l2/vidc/venc.mk @@ -77,7 +77,12 @@ include $(CLEAR_VARS) libmm-venc-inc := $(LOCAL_PATH)/venc/inc libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc +libmm-venc-inc += hardware/qcom/media/msm8974/mm-core/inc +libmm-venc-inc += hardware/qcom/media/msm8974/libstagefrighthw +libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display +libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno libmm-venc-inc += frameworks/native/include/media/hardware +libmm-venc-inc += frameworks/native/include/media/openmax libmm-venc-inc += hardware/qcom/media/msm8974/libc2dcolorconvert libmm-venc-inc += frameworks/av/include/media/stagefright libmm-venc-inc += frameworks/av/include/media/hardware @@ -89,8 +94,7 @@ LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \ - libc2dcolorconvert libdl libgui libOmxCore libstagefrighthw -LOCAL_SHARED_LIBRARIES += gralloc.$(TARGET_BOARD_PLATFORM) copybit.$(TARGET_BOARD_PLATFORM) + libc2dcolorconvert libdl libgui LOCAL_SRC_FILES := venc/src/omx_video_base.cpp LOCAL_SRC_FILES += venc/src/omx_video_encoder.cpp -- cgit v1.2.3