commit ca75a63e98e636598fe5f2846edec7b41fdb2a15
author The Android Automerger <android-build@google.com> Thu Aug 20 01:03:41 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Aug 20 01:03:41 2015 -0700
tree 1d0fe3a45a35156bea0de3d842bcf6d25ec8e6d4
parent f23399fbd9d7bcdd9067a4881218ac16779ffebc
parent a2ddf48d768b9d58ef1aca5fbe43bd130487d9e0

merge in mnc-release history after reset to mnc-dev

mm-video-v4l2/vidc/vdec.mk

diff --git a/mm-video-v4l2/vidc/vdec.mk b/mm-video-v4l2/vidc/vdec.mk
index c4079b1..ffee562 100644
--- a/mm-video-v4l2/vidc/vdec.mk
+++ b/mm-video-v4l2/vidc/vdec.mk
@@ -42,6 +42,7 @@
 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

mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp

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 2e840c1..22115b3 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 @@
         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;
         }