Piteball/android_hardware_qcom_media
1
0
Fork 0
mirror of https://github.com/followmsi/android_hardware_qcom_media.git synced 2024-10-31 22:47:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge "mm-video-v4l2: Add support for AllocateNativeHandle extension" into video-userspace.lnx.2.1-dev

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-08 17:38:58 -08:00 committed by Gerrit - the friendly Code Review server
commit 0127c5ebdb
4 changed files with 101 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mm-video-v4l2/vidc/venc/inc/omx_video_base.h
View file

@ -691,6 +691,8 @@ class omx_video: public qc_omx_component
int pending_input_buffers; int pending_input_buffers;
int pending_output_buffers; int pending_output_buffers;
bool allocate_native_handle;
uint64_t m_out_bm_count; uint64_t m_out_bm_count;
uint64_t m_inp_bm_count; uint64_t m_inp_bm_count;
uint64_t m_flags; uint64_t m_flags;

70
mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
View file

@ -2467,6 +2467,12 @@ OMX_ERRORTYPE omx_video::get_extension_index(OMX_IN OMX_HANDLETYPE hComp,
*indexType = (OMX_INDEXTYPE)OMX_QTIIndexConfigDescribeColorAspects; *indexType = (OMX_INDEXTYPE)OMX_QTIIndexConfigDescribeColorAspects;
return OMX_ErrorNone; return OMX_ErrorNone;
} }
if (extn_equals(paramName, "OMX.google.android.index.allocateNativeHandle")) {
*indexType = (OMX_INDEXTYPE)OMX_GoogleAndroidIndexAllocateNativeHandle;
return OMX_ErrorNone;
}
return OMX_ErrorNotImplemented; return OMX_ErrorNotImplemented;
} }
@ -3044,11 +3050,18 @@ OMX_ERRORTYPE omx_video::free_output_buffer(OMX_BUFFERHEADERTYPE *bufferHdr)
munmap (m_pOutput_pmem[index].buffer, munmap (m_pOutput_pmem[index].buffer,
m_pOutput_pmem[index].size); m_pOutput_pmem[index].size);
} else { } else {
char *data = (char*) m_pOutput_pmem[index].buffer; if (allocate_native_handle) {
native_handle_t *handle = NULL; native_handle_t *handle = NULL;
memcpy(&handle, data + sizeof(OMX_U32), sizeof(native_handle_t*)); handle = (native_handle_t *)m_pOutput_pmem[index].buffer;
native_handle_delete(handle); native_handle_close(handle);
free(m_pOutput_pmem[index].buffer); native_handle_delete(handle);
} else {
char *data = (char*) m_pOutput_pmem[index].buffer;
native_handle_t *handle = NULL;
memcpy(&handle, data + sizeof(OMX_U32), sizeof(native_handle_t*));
native_handle_delete(handle);
free(m_pOutput_pmem[index].buffer);
}
} }
close (m_pOutput_pmem[index].fd); close (m_pOutput_pmem[index].fd);
#ifdef USE_ION #ifdef USE_ION
@ -3439,24 +3452,37 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer(
else { else {
//This should only be used for passing reference to source type and //This should only be used for passing reference to source type and
//secure handle fd struct native_handle_t* //secure handle fd struct native_handle_t*
native_handle_t *handle = native_handle_create(1, 3); //fd, offset, size, alloc length if (allocate_native_handle) {
if (!handle) { native_handle_t *nh = native_handle_create(1 /*numFds*/, 3 /*numInts*/);
DEBUG_PRINT_ERROR("ERROR: native handle creation failed"); if (!nh) {
return OMX_ErrorInsufficientResources; DEBUG_PRINT_ERROR("Native handle create failed");
return OMX_ErrorInsufficientResources;
}
nh->data[0] = m_pOutput_pmem[i].fd;
nh->data[1] = 0;
nh->data[2] = 0;
nh->data[3] = ALIGN(m_sOutPortDef.nBufferSize, 4096);
m_pOutput_pmem[i].buffer = (OMX_U8 *)nh;
} else {
native_handle_t *handle = native_handle_create(1, 3); //fd, offset, size, alloc length
if (!handle) {
DEBUG_PRINT_ERROR("ERROR: native handle creation failed");
return OMX_ErrorInsufficientResources;
}
m_pOutput_pmem[i].buffer = malloc(sizeof(output_metabuffer));
if (m_pOutput_pmem[i].buffer == NULL) {
DEBUG_PRINT_ERROR("%s: Failed to allocate meta buffer", __func__);
return OMX_ErrorInsufficientResources;
}
(*bufferHdr)->nAllocLen = sizeof(output_metabuffer);
handle->data[0] = m_pOutput_pmem[i].fd;
handle->data[1] = 0;
handle->data[2] = 0;
handle->data[3] = ALIGN(m_sOutPortDef.nBufferSize, 4096);
output_metabuffer *buffer = (output_metabuffer*) m_pOutput_pmem[i].buffer;
buffer->type = 1;
buffer->nh = handle;
} }
m_pOutput_pmem[i].buffer = malloc(sizeof(output_metabuffer));
if (m_pOutput_pmem[i].buffer == NULL) {
DEBUG_PRINT_ERROR("%s: Failed to allocate meta buffer", __func__);
return OMX_ErrorInsufficientResources;
}
(*bufferHdr)->nAllocLen = sizeof(output_metabuffer);
handle->data[0] = m_pOutput_pmem[i].fd;
handle->data[1] = 0;
handle->data[2] = 0;
handle->data[3] = ALIGN(m_sOutPortDef.nBufferSize, 4096);
output_metabuffer *buffer = (output_metabuffer*) m_pOutput_pmem[i].buffer;
buffer->type = 1;
buffer->nh = handle;
} }
(*bufferHdr)->pBuffer = (OMX_U8 *)m_pOutput_pmem[i].buffer; (*bufferHdr)->pBuffer = (OMX_U8 *)m_pOutput_pmem[i].buffer;

57
mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
View file

@ -1148,6 +1148,31 @@ OMX_ERRORTYPE omx_venc::set_parameter(OMX_IN OMX_HANDLETYPE hComp,
break; break;
} }
case OMX_GoogleAndroidIndexAllocateNativeHandle:
{
VALIDATE_OMX_PARAM_DATA(paramData, AllocateNativeHandleParams);
AllocateNativeHandleParams* allocateNativeHandleParams = (AllocateNativeHandleParams *) paramData;
if (!secure_session) {
DEBUG_PRINT_ERROR("Enable/Disable allocate-native-handle allowed only in secure session");
eRet = OMX_ErrorUnsupportedSetting;
break;
} else if (allocateNativeHandleParams->nPortIndex != PORT_INDEX_OUT) {
DEBUG_PRINT_ERROR("Enable/Disable allocate-native-handle allowed only on Output port!");
eRet = OMX_ErrorUnsupportedSetting;
break;
} else if (m_out_mem_ptr) {
DEBUG_PRINT_ERROR("Enable/Disable allocate-native-handle is not allowed since Output port is not free !");
eRet = OMX_ErrorInvalidState;
break;
}
if (allocateNativeHandleParams != NULL) {
allocate_native_handle = allocateNativeHandleParams->enable;
}
break;
}
case OMX_IndexParamVideoQuantization: case OMX_IndexParamVideoQuantization:
{ {
VALIDATE_OMX_PARAM_DATA(paramData, OMX_VIDEO_PARAM_QUANTIZATIONTYPE); VALIDATE_OMX_PARAM_DATA(paramData, OMX_VIDEO_PARAM_QUANTIZATIONTYPE);
@ -1292,14 +1317,9 @@ OMX_ERRORTYPE omx_venc::set_parameter(OMX_IN OMX_HANDLETYPE hComp,
} }
} }
} else if (pParam->nPortIndex == PORT_INDEX_OUT && secure_session) { } else if (pParam->nPortIndex == PORT_INDEX_OUT && secure_session) {
if (pParam->bStoreMetaData != meta_mode_enable) { DEBUG_PRINT_ERROR("set_parameter: metamode is "
if (!handle->venc_set_meta_mode(pParam->bStoreMetaData)) { "valid for input port only in secure session");
DEBUG_PRINT_ERROR("\nERROR: set Metabuffer mode %d fail",
pParam->bStoreMetaData);
return OMX_ErrorUnsupportedSetting; return OMX_ErrorUnsupportedSetting;
}
meta_mode_enable = pParam->bStoreMetaData;
}
} else { } else {
DEBUG_PRINT_ERROR("set_parameter: metamode is " DEBUG_PRINT_ERROR("set_parameter: metamode is "
"valid for input port only"); "valid for input port only");
@ -2622,13 +2642,22 @@ int omx_venc::async_message_process (void *context, void* message)
m_sVenc_msg->buf.len); m_sVenc_msg->buf.len);
} }
} else if (omx->is_secure_session()) { } else if (omx->is_secure_session()) {
output_metabuffer *meta_buf = (output_metabuffer *)(omxhdr->pBuffer); if (omx->allocate_native_handle) {
native_handle_t *nh = meta_buf->nh; native_handle_t *nh = (native_handle_t *)(omxhdr->pBuffer);
nh->data[1] = m_sVenc_msg->buf.offset; nh->data[1] = m_sVenc_msg->buf.offset;
nh->data[2] = m_sVenc_msg->buf.len; nh->data[2] = m_sVenc_msg->buf.len;
omxhdr->nFilledLen = sizeof(output_metabuffer); omxhdr->nFilledLen = m_sVenc_msg->buf.len;
omxhdr->nTimeStamp = m_sVenc_msg->buf.timestamp; omxhdr->nTimeStamp = m_sVenc_msg->buf.timestamp;
omxhdr->nFlags = m_sVenc_msg->buf.flags; omxhdr->nFlags = m_sVenc_msg->buf.flags;
} else {
output_metabuffer *meta_buf = (output_metabuffer *)(omxhdr->pBuffer);
native_handle_t *nh = meta_buf->nh;
nh->data[1] = m_sVenc_msg->buf.offset;
nh->data[2] = m_sVenc_msg->buf.len;
omxhdr->nFilledLen = sizeof(output_metabuffer);
omxhdr->nTimeStamp = m_sVenc_msg->buf.timestamp;
omxhdr->nFlags = m_sVenc_msg->buf.flags;
}
} else { } else {
omxhdr->nFilledLen = 0; omxhdr->nFilledLen = 0;
} }

11
mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
View file

@ -4251,9 +4251,14 @@ bool venc_dev::venc_fill_buf(void *buffer, void *pmem_data_buf,unsigned index,un
buf.flags = 0; buf.flags = 0;
if (venc_handle->is_secure_session()) { if (venc_handle->is_secure_session()) {
output_metabuffer *meta_buf = (output_metabuffer *)(bufhdr->pBuffer); if (venc_handle->allocate_native_handle) {
native_handle_t *handle_t = meta_buf->nh; native_handle_t *handle_t = (native_handle_t *)(bufhdr->pBuffer);
plane[0].length = handle_t->data[3]; plane[0].length = handle_t->data[3];
} else {
output_metabuffer *meta_buf = (output_metabuffer *)(bufhdr->pBuffer);
native_handle_t *handle_t = meta_buf->nh;
plane[0].length = handle_t->data[3];
}
} }
if (mBatchSize) { if (mBatchSize) {