Merge "libgralloc: Add support to use CAMERA_HEAP"

This commit is contained in:
Linux Build Service Account
2013-05-31 20:47:31 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 5 additions and 6 deletions

View File

@@ -225,6 +225,9 @@ int IonController::allocate(alloc_data& data, int usage)
ionFlags |= ION_HEAP(ION_IOMMU_HEAP_ID); ionFlags |= ION_HEAP(ION_IOMMU_HEAP_ID);
} }
if(usage & GRALLOC_USAGE_PRIVATE_CAMERA_HEAP)
ionFlags |= ION_HEAP(ION_CAMERA_HEAP_ID);
if(usage & GRALLOC_USAGE_PRIVATE_ADSP_HEAP) if(usage & GRALLOC_USAGE_PRIVATE_ADSP_HEAP)
ionFlags |= ION_HEAP(ION_ADSP_HEAP_ID); ionFlags |= ION_HEAP(ION_ADSP_HEAP_ID);

View File

@@ -68,12 +68,8 @@ enum {
/* Close Caption displayed on an external display only */ /* Close Caption displayed on an external display only */
GRALLOC_USAGE_PRIVATE_EXTERNAL_CC = 0x00200000, GRALLOC_USAGE_PRIVATE_EXTERNAL_CC = 0x00200000,
/* Use this flag to request content protected buffers. Please note /* CAMERA heap is a carveout heap for camera, is not secured*/
* that this flag is different from the GRALLOC_USAGE_PROTECTED flag GRALLOC_USAGE_PRIVATE_CAMERA_HEAP = 0x00400000,
* which can be used for buffers that are not secured for DRM
* but still need to be protected from screen captures
*/
GRALLOC_USAGE_PRIVATE_CP_BUFFER = 0x00400000,
}; };
enum { enum {