diff options
| author | Liu Bolun <bolunx.liu@intel.com> | 2013-02-27 18:44:33 -0500 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:50 -0700 |
| commit | b75614ed7b576e521db3bd442837e5ac1e1d741d (patch) | |
| tree | 555d869d2f5cc408dc9bba0a57d47f879b261fd7 | |
| parent | d140f2905e74a1bdf86caf02b462204f6fde6f01 (diff) | |
| download | android_hardware_intel_common_omx-components-b75614ed7b576e521db3bd442837e5ac1e1d741d.tar.gz android_hardware_intel_common_omx-components-b75614ed7b576e521db3bd442837e5ac1e1d741d.tar.bz2 android_hardware_intel_common_omx-components-b75614ed7b576e521db3bd442837e5ac1e1d741d.zip | |
TARGET_DEVICE should not be used in Android.mk
BZ: 88258
Remove TARGET_DEVICE/TARGET_PRODUCT from Android.mk
Add a feature (USE_VIDEO_EFFECT) to enable/disable video effect in BoardConfig.mk
Using feature selection rather than TARGET_DEVICE selection.
If set USE_VIDEO_EFFECT as true, it support video effect and OMX_INPUT_BUFFER_COUNT is 5;
If not, it was 2.
Refine marco define code.
Change-Id: I46d87bb7763c58b936864e525b5f0864a41f0ada
Signed-off-by: Liu Bolun <bolunx.liu@intel.com>
Reviewed-on: http://android.intel.com:8080/94207
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Yuan, Shengquan <shengquan.yuan@intel.com>
Reviewed-by: Zhao, Leo <leo.zhao@intel.com>
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
| -rw-r--r-- | videocodec/Android.mk | 14 | ||||
| -rw-r--r-- | videocodec/OMXVideoEncoderBase.h | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/videocodec/Android.mk b/videocodec/Android.mk index 79d3c53..ae99e38 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -1,18 +1,8 @@ ifeq ($(strip $(BOARD_USES_WRS_OMXIL_CORE)),true) LOCAL_PATH := $(call my-dir) -ifeq ($(REF_PRODUCT_NAME),mfld_gi) -LOCAL_C_FLAGS := -DMFLD_GI -else ifneq (,$(findstring $(REF_PRODUCT_NAME),salitpa)) -LOCAL_C_FLAGS := -DMFLD_DV10 -else ifneq (,$(findstring $(REF_PRODUCT_NAME),victoriabay redhookbay)) -LOCAL_C_FLAGS := -DCLVT -else ifeq ($(REF_PRODUCT_NAME), mrfl_vp) -LOCAL_C_FLAGS := -DMRFL_VP -else ifeq ($(REF_PRODUCT_NAME),yukkabeach) -LOCAL_C_FLAGS := -DYUKKA -else -LOCAL_C_FLAGS := -DMFLD_PR2 +ifeq ($(strip $(USE_VIDEO_EFFECT)),true) +LOCAL_C_FLAGS := -DUSE_VIDEO_EFFECT endif include $(CLEAR_VARS) diff --git a/videocodec/OMXVideoEncoderBase.h b/videocodec/OMXVideoEncoderBase.h index cf52290..d14d69d 100644 --- a/videocodec/OMXVideoEncoderBase.h +++ b/videocodec/OMXVideoEncoderBase.h @@ -94,10 +94,10 @@ private: // OMX_PARAM_PORTDEFINITIONTYPE INPORT_MIN_BUFFER_COUNT = 1, // FIXME: increate input buffer count to 5 -#if (MFLD_GI || YUKKA) - INPORT_ACTUAL_BUFFER_COUNT = 2, -#else +#ifdef USE_VIDEO_EFFECT INPORT_ACTUAL_BUFFER_COUNT = 5, +#else + INPORT_ACTUAL_BUFFER_COUNT = 2, #endif INPORT_BUFFER_SIZE = 1382400, |