diff options
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | omx_avcenc/Android.mk | 7 | ||||
| -rw-r--r-- | omx_avcenc/src/OMXAVCComponent.cpp | 10 | ||||
| -rw-r--r-- | omx_h263enc/Android.mk | 7 | ||||
| -rw-r--r-- | omx_h263enc/src/OMXH263Component.cpp | 10 | ||||
| -rw-r--r-- | omx_m4venc/Android.mk | 7 | ||||
| -rw-r--r-- | omx_m4venc/src/OMXMPEG4Component.cpp | 10 | ||||
| -rw-r--r-- | psb/Android.mk | 5 | ||||
| -rw-r--r-- | psb/psb.cpp | 7 |
9 files changed, 52 insertions, 20 deletions
@@ -5,6 +5,9 @@ include $(CLEAR_VARS) VENDORS_INTEL_MRST_COMPONENTS_ROOT := $(LOCAL_PATH) +COMPONENT_SUPPORT_BUFFER_SHARING := false +COMPONENT_SUPPORT_OPENCORE := false + PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wrs_omxil_components.list:system/etc/wrs_omxil_components.list #$(call add-prebuilt-files, ETC, wrs_omxil_components.list) @@ -15,8 +18,9 @@ GLIB_TOP := hardware/intel/glib LIBVA_TOP := hardware/intel/libva LIBINFODUMP_TOP := hardware/intel/omx-components/libinfodump LIBBASECODEC_TOP:= hardware/intel/omx-components/libbasecodec -#PV_TOP := external/opencore -ifeq (1,0) + +ifeq ($(strip $(COMPONENT_SUPPORT_OPENCORE)), true) +PV_TOP := external/opencore PV_INCLUDES := \ $(PV_TOP)/android \ $(PV_TOP)/extern_libs_v2/khronos/openmax/include \ @@ -37,7 +41,6 @@ endif # mrst sst audio #-include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/sst/Android.mk -COMPONENT_USE_BUFFERSHARING := false #intel video decoders include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/psb/Android.mk diff --git a/omx_avcenc/Android.mk b/omx_avcenc/Android.mk index 42a2ed6..27e014b 100644 --- a/omx_avcenc/Android.mk +++ b/omx_avcenc/Android.mk @@ -33,8 +33,11 @@ LOCAL_C_INCLUDES := \ $(LIBBASECODEC_TOP)/inc \ $(LOCAL_PATH)/inc -ifeq ($(strip $(COMPONENT_USE_BUFFERSHARING)),true) -LOCAL_CFLAGS += -DCOMPONENT_USE_BUFFERSHARING +ifeq ($(strip $(COMPONENT_SUPPORT_BUFFERSHARING)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_BUFFER_SHARING +endif +ifeq ($(strip $(COMPONENT_SUPPORT_OPENCORE)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_OPENCORE endif include $(BUILD_SHARED_LIBRARY) diff --git a/omx_avcenc/src/OMXAVCComponent.cpp b/omx_avcenc/src/OMXAVCComponent.cpp index 949eb8b..93c5b88 100644 --- a/omx_avcenc/src/OMXAVCComponent.cpp +++ b/omx_avcenc/src/OMXAVCComponent.cpp @@ -17,8 +17,10 @@ #include <portvideo.h> #include <componentbase.h> -//#include <pv_omxcore.h> -//#include <pv_omxdefs.h> +#ifdef COMPONENT_SUPPORT_OPENCORE +#include <pv_omxcore.h> +#include <pv_omxdefs.h> +#endif #include <va/va.h> #include <va/va_android.h> @@ -434,6 +436,7 @@ OMX_ERRORTYPE OMXAVCComponent::ComponentGetParameter( break; } #ifdef COMPONENT_SUPPORT_BUFFER_SHARING +#ifdef COMPONENT_SUPPORT_OPENCORE case OMX_IndexIntelPrivateInfo: { OMX_VIDEO_CONFIG_PRI_INFOTYPE *p = @@ -466,7 +469,8 @@ OMX_ERRORTYPE OMXAVCComponent::ComponentGetParameter( break; } #endif -#if 0 +#endif +#ifdef COMPONENT_SUPPORT_OPENCORE /* PVOpenCore */ case (OMX_INDEXTYPE) PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX: { diff --git a/omx_h263enc/Android.mk b/omx_h263enc/Android.mk index 592c601..a556cd0 100644 --- a/omx_h263enc/Android.mk +++ b/omx_h263enc/Android.mk @@ -34,8 +34,11 @@ LOCAL_C_INCLUDES := \ $(LIBBASECODEC_TOP)/inc \ $(LOCAL_PATH)/inc -ifeq ($(strip $(COMPONENT_USE_BUFFERSHARING)),true) -LOCAL_CFLAGS += -DCOMPONENT_USE_BUFFERSHARING +ifeq ($(strip $(COMPONENT_SUPPORT_BUFFERSHARING)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_BUFFER_SHARING +endif +ifeq ($(strip $(COMPONENT_SUPPORT_OPENCORE)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_OPENCORE endif diff --git a/omx_h263enc/src/OMXH263Component.cpp b/omx_h263enc/src/OMXH263Component.cpp index 1e4ef39..5c2b2d0 100644 --- a/omx_h263enc/src/OMXH263Component.cpp +++ b/omx_h263enc/src/OMXH263Component.cpp @@ -17,8 +17,10 @@ #include <portvideo.h> #include <componentbase.h> -//#include <pv_omxcore.h> -//#include <pv_omxdefs.h> +#ifdef COMPONENT_SUPPORT_OPENCORE +#include <pv_omxcore.h> +#include <pv_omxdefs.h> +#endif #include <va/va.h> #include <va/va_android.h> @@ -423,6 +425,7 @@ OMX_ERRORTYPE OMXH263Component::ComponentGetParameter( break; } #ifdef COMPONENT_SUPPORT_BUFFER_SHARING +#ifdef COMPONENT_SUPPORT_OPENCORE case OMX_IndexIntelPrivateInfo: { OMX_VIDEO_CONFIG_PRI_INFOTYPE *p = (OMX_VIDEO_CONFIG_PRI_INFOTYPE *)pComponentParameterStructure; @@ -450,7 +453,8 @@ OMX_ERRORTYPE OMXH263Component::ComponentGetParameter( break; } #endif -#if 0 +#endif +#ifdef COMPONENT_SUPPORT_OPENCORE /* PVOpenCore */ case (OMX_INDEXTYPE) PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX: { PV_OMXComponentCapabilityFlagsType *p = diff --git a/omx_m4venc/Android.mk b/omx_m4venc/Android.mk index e786f81..e431918 100644 --- a/omx_m4venc/Android.mk +++ b/omx_m4venc/Android.mk @@ -33,8 +33,11 @@ LOCAL_C_INCLUDES := \ $(LIBBASECODEC_TOP)/inc \ $(LOCAL_PATH)/inc -ifeq ($(strip $(COMPONENT_USE_BUFFERSHARING)),true) -LOCAL_CFLAGS += -DCOMPONENT_USE_BUFFERSHARING +ifeq ($(strip $(COMPONENT_SUPPORT_BUFFERSHARING)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_BUFFER_SHARING +endif +ifeq ($(strip $(COMPONENT_SUPPORT_OPENCORE)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_OPENCORE endif include $(BUILD_SHARED_LIBRARY) diff --git a/omx_m4venc/src/OMXMPEG4Component.cpp b/omx_m4venc/src/OMXMPEG4Component.cpp index dd7fc1a..b48cabd 100644 --- a/omx_m4venc/src/OMXMPEG4Component.cpp +++ b/omx_m4venc/src/OMXMPEG4Component.cpp @@ -17,8 +17,10 @@ #include <portvideo.h> #include <componentbase.h> -//#include <pv_omxcore.h> -//#include <pv_omxdefs.h> +#ifdef COMPONENT_SUPPORT_OPENCORE +#include <pv_omxcore.h> +#include <pv_omxdefs.h> +#endif #include <va/va.h> #include <va/va_android.h> @@ -419,6 +421,7 @@ OMX_ERRORTYPE OMXMPEG4Component::ComponentGetParameter( break; } #ifdef COMPONENT_SUPPORT_BUFFER_SHARING +#ifdef COMPONENT_SUPPORT_OPENCORE case OMX_IndexIntelPrivateInfo: { OMX_VIDEO_CONFIG_PRI_INFOTYPE *p = (OMX_VIDEO_CONFIG_PRI_INFOTYPE *)pComponentParameterStructure; @@ -446,7 +449,8 @@ OMX_ERRORTYPE OMXMPEG4Component::ComponentGetParameter( break; } #endif -#if 0 +#endif +#ifdef COMPONENT_SUPPORT_OPENCORE /* PVOpenCore */ case (OMX_INDEXTYPE) PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX: { PV_OMXComponentCapabilityFlagsType *p = diff --git a/psb/Android.mk b/psb/Android.mk index 5c94c00..002683c 100644 --- a/psb/Android.mk +++ b/psb/Android.mk @@ -43,6 +43,11 @@ LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/libmixvbp \ $(TARGET_OUT_HEADERS)/libpsb_drm +ifeq ($(strip $(COMPONENT_SUPPORT_OPENCORE)),true) +LOCAL_CFLAGS += -DCOMPONENT_SUPPORT_OPENCORE +endif + + LOCAL_COPY_HEADERS_TO := libwrs_omxil_intel_mrst_psb LOCAL_COPY_HEADERS := vabuffer.h diff --git a/psb/psb.cpp b/psb/psb.cpp index 03409fd..121c15f 100644 --- a/psb/psb.cpp +++ b/psb/psb.cpp @@ -38,7 +38,10 @@ #include <portvideo.h> #include <componentbase.h> -//#include <pv_omxcore.h> +#ifdef COMPONENT_SUPPORT_OPENCORE +#include <pv_omxcore.h> +#include <pv_omxdefs.h> +#endif #include <gthread.h> #include <glib.h> @@ -876,7 +879,7 @@ OMX_ERRORTYPE MrstPsbComponent::ComponentGetParameter( memcpy(p, port->GetPortPrivateInfoParam(), sizeof(*p)); break; } -#if 0 +#ifdef COMPONENT_SUPPORT_OPENCORE /* PVOpenCore */ case (OMX_INDEXTYPE) PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX: { PV_OMXComponentCapabilityFlagsType *p = |