diff options
| author | Shivaprasad Hongal <shongal@codeaurora.org> | 2015-08-19 21:10:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 21:10:47 +0000 |
| commit | fc756c82140c35ec1a9e8b3167e3caa43f5bf3dd (patch) | |
| tree | 8d18890762a918882b150215de519143df132615 | |
| parent | 7d6e61888e010bbe79878827a3a593699e9a2595 (diff) | |
| parent | f23399fbd9d7bcdd9067a4881218ac16779ffebc (diff) | |
| download | android_hardware_qcom_media-fc756c82140c35ec1a9e8b3167e3caa43f5bf3dd.tar.gz android_hardware_qcom_media-fc756c82140c35ec1a9e8b3167e3caa43f5bf3dd.tar.bz2 android_hardware_qcom_media-fc756c82140c35ec1a9e8b3167e3caa43f5bf3dd.zip | |
am f23399fb: mm-video-v4l2: vdec: Disable input buffer cached-allocations.
* commit 'f23399fbd9d7bcdd9067a4881218ac16779ffebc':
mm-video-v4l2: vdec: Disable input buffer cached-allocations.
| -rw-r--r-- | mm-video-v4l2/vidc/vdec.mk | 1 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk index c4079b19..ffee562d 100644 --- a/mm-video-v4l2/vidc/vdec.mk +++ b/mm-video-v4l2/vidc/vdec.mk @@ -42,6 +42,7 @@ libOmxVdec-def += -DMAX_RES_1080P_EBI libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT libOmxVdec-def += -D_MSM8974_ libOmxVdec-def += -D_HEVC_USE_ADSP_HEAP_ +libOmxVdec-def += -DDISABLE_INPUT_BUFFER_CACHE endif ifeq ($(TARGET_BOARD_PLATFORM),msm7627a) libOmxVdec-def += -DMAX_RES_720P 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 2e840c12..22115b3d 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -5361,7 +5361,13 @@ OMX_ERRORTYPE omx_vdec::allocate_input_buffer( drv_ctx.ip_buf_ion_info[i].ion_device_fd = alloc_map_ion_memory( drv_ctx.ip_buf.buffer_size,drv_ctx.op_buf.alignment, &drv_ctx.ip_buf_ion_info[i].ion_alloc_data, - &drv_ctx.ip_buf_ion_info[i].fd_ion_data, secure_mode ? ION_SECURE : ION_FLAG_CACHED); + &drv_ctx.ip_buf_ion_info[i].fd_ion_data, secure_mode ? ION_SECURE +#ifndef DISABLE_INPUT_BUFFER_CACHE + : ION_FLAG_CACHED +#else + : 0 +#endif + ); if (drv_ctx.ip_buf_ion_info[i].ion_device_fd < 0) { return OMX_ErrorInsufficientResources; } |