mm-video:venc: Add required ION Heap ID for video encoder buffers

- Allocate video encoder buffers from ION_CAMERA_HEAP_ID memory
  for 8x55 target.

Change-Id: If9d4d4d484d53bffe41940a04adf589d7d1a9ebe

Author: Maheshwar Ajja

mm-video/vidc/venc/inc/omx_video_base.h

@@ -83,7 +83,11 @@ class VideoHeap : public MemoryHeapBase
 
 #ifdef USE_ION
     static const char* MEM_DEVICE = "/dev/ion";
+    #ifdef MAX_RES_720P
+    #define MEM_HEAP_ID ION_CAMERA_HEAP_ID
+    #else
     #define MEM_HEAP_ID ION_CP_MM_HEAP_ID
+    #endif
 #elif MAX_RES_720P
 static const char* MEM_DEVICE = "/dev/pmem_adsp";
 #elif MAX_RES_1080P_EBI

mm-video/vidc/venc/src/omx_video_base.cpp

@@ -4474,8 +4474,12 @@ int omx_video::alloc_map_ion_memory(int size,struct ion_allocation_data *alloc_d
         if (secure_session)
            alloc_data->heap_mask = (ION_HEAP(MEM_HEAP_ID) | ION_SECURE);
         else
+#ifdef MAX_RES_720P
+           alloc_data->heap_mask = ION_HEAP(MEM_HEAP_ID);
+#else
            alloc_data->heap_mask = (ION_HEAP(MEM_HEAP_ID) |
                 ION_HEAP(ION_IOMMU_HEAP_ID));
+#endif
 
         pthread_mutex_lock(&m_venc_ionlock);
         rc = ioctl(ion_device_fd,ION_IOC_ALLOC,alloc_data);

mm-video/vidc/venc/src/video_encoder_device.cpp

@@ -1448,9 +1448,13 @@ OMX_U32 venc_dev::pmem_allocate(OMX_U32 size, OMX_U32 alignment, OMX_U32 count)
 
   recon_buff[count].alloc_data.flags = 0;
   recon_buff[count].alloc_data.len = size;
+#ifdef MAX_RES_720P
+  recon_buff[count].alloc_data.heap_mask = ION_HEAP(MEM_HEAP_ID);
+#else
   recon_buff[count].alloc_data.heap_mask = (ION_HEAP(MEM_HEAP_ID) |
                   (venc_encoder->is_secure_session() ? ION_SECURE
                    : ION_HEAP(ION_IOMMU_HEAP_ID)));
+#endif
   recon_buff[count].alloc_data.align = clip2(alignment);
   if (recon_buff[count].alloc_data.align != 8192)
     recon_buff[count].alloc_data.align = 8192;