From 3b519a8748148f01b1c6963ab76151f75308fede Mon Sep 17 00:00:00 2001 From: Manikanta Sivapala Date: Fri, 10 Jun 2016 09:46:44 +0530 Subject: mm-video: update metadata-type used for HAL1 based recording. -Update metadata buffer type from kMetadataBufferTypeCameraSource to kMetadataBufferTypeNativeHandleSource. -Surface recording uses a different metadata as compared to legacy camera metadata (HAL1). Cast the gralloc-meta to appropriate struct to extract the handle. CRs-Fixed: 1026926 Change-Id: Iae638c461d369a81fb8587d612ba26d525dc7953 --- mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp') diff --git a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp index 6306d411..ecf9772a 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp @@ -1805,11 +1805,11 @@ bool omx_venc::dev_empty_buf if (meta_mode_enable) { - encoder_media_buffer_type *meta_buf = NULL; - meta_buf = (encoder_media_buffer_type *)bufhdr->pBuffer; + LEGACY_CAM_METADATA_TYPE *meta_buf = NULL; + meta_buf = (LEGACY_CAM_METADATA_TYPE *)bufhdr->pBuffer; if (meta_buf) { - if (meta_buf->buffer_type == kMetadataBufferTypeCameraSource) + if (meta_buf->buffer_type == LEGACY_CAM_SOURCE) { offset = meta_buf->meta_handle->data[1]; size = meta_buf->meta_handle->data[2]; @@ -1826,7 +1826,8 @@ bool omx_venc::dev_empty_buf } else if (meta_buf->buffer_type == kMetadataBufferTypeGrallocSource) { - private_handle_t *handle = (private_handle_t *)meta_buf->meta_handle; + VideoGrallocMetadata *meta_buf = (VideoGrallocMetadata *)bufhdr->pBuffer; + private_handle_t *handle = (private_handle_t *)meta_buf->pHandle; size = handle->size; } } @@ -2440,18 +2441,19 @@ SWVENC_STATUS omx_venc::swvenc_empty_buffer_done #ifdef _ANDROID_ICS_ if (meta_mode_enable) { - encoder_media_buffer_type *meta_buf = NULL; + LEGACY_CAM_METADATA_TYPE *meta_buf = NULL; unsigned int size = 0; - meta_buf = (encoder_media_buffer_type *)omxhdr->pBuffer; + meta_buf = (LEGACY_CAM_METADATA_TYPE *)omxhdr->pBuffer; if (meta_buf) { - if (meta_buf->buffer_type == kMetadataBufferTypeCameraSource) + if (meta_buf->buffer_type == LEGACY_CAM_SOURCE) { size = meta_buf->meta_handle->data[2]; } else if (meta_buf->buffer_type == kMetadataBufferTypeGrallocSource) { - private_handle_t *handle = (private_handle_t *)meta_buf->meta_handle; + VideoGrallocMetadata *meta_buf = (VideoGrallocMetadata *)omxhdr->pBuffer; + private_handle_t *handle = (private_handle_t *)meta_buf->pHandle; size = handle->size; } } -- cgit v1.2.3