From c6b54b7d0b3b477acaa9f4e57241be77d234a8d5 Mon Sep 17 00:00:00 2001 From: Mansoor Aftab Date: Wed, 1 May 2013 14:37:51 -0700 Subject: Camera: Correct the Heap ID used for preview buffer allocation Changed the heap id usage flags used for allocating camera preview buffers. Previous use of GRALLOC_USAGE_PRIVATE_MM_HEAP was incorrect since that is reserved for secure video. Changing usage flags to use IOMMU HEAP & use SYSTEM HEAP as fallback. Change-Id: If89fd9594bdee6d4efdbc4e54e616e2a61e7b9e5 --- camera/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'camera') diff --git a/camera/Android.mk b/camera/Android.mk index 3ce0d1a..d34c60c 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -33,8 +33,8 @@ ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true) LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID # 8660=SMI, Rest=EBI LOCAL_CFLAGS += -DCAMERA_ZSL_ION_HEAP_ID=ION_CP_MM_HEAP_ID ifeq ($(TARGET_BOARD_PLATFORM),msm8960) - LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_MM_HEAP - LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP + LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP + LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID LOCAL_CFLAGS += -DCAMERA_GRALLOC_CACHING_ID=0 -- cgit v1.2.3