diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-28 00:35:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-28 00:35:56 +0000 |
| commit | 5261c87960262c71bbeec235a78f0b3d580e9921 (patch) | |
| tree | 28659b4a8a26ca179466077ec7d873613d670176 | |
| parent | 167e5e3c177f16dc56cda5ae346c1d510857bf68 (diff) | |
| parent | 8e9fdc3254721b488ebdb9e9e62fb2d99eac392d (diff) | |
| download | android_hardware_qcom_media-5261c87960262c71bbeec235a78f0b3d580e9921.tar.gz android_hardware_qcom_media-5261c87960262c71bbeec235a78f0b3d580e9921.tar.bz2 android_hardware_qcom_media-5261c87960262c71bbeec235a78f0b3d580e9921.zip | |
Merge "Revert "Revert "mm-video: vidc: make extended index for meta buffer mode generic""" into klp-dev
| -rw-r--r-- | mm-core/inc/OMX_QCOMExtns.h | 2 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h index 3de0e965..bef762d1 100644 --- a/mm-core/inc/OMX_QCOMExtns.h +++ b/mm-core/inc/OMX_QCOMExtns.h @@ -365,7 +365,7 @@ enum OMX_QCOM_EXTN_INDEXTYPE OMX_QcomIndexParamEnableTimeStampReorder = 0x7F00001B, /*"OMX.google.android.index.storeMetaDataInBuffers"*/ - OMX_QcomIndexParamVideoEncodeMetaBufferMode = 0x7F00001C, + OMX_QcomIndexParamVideoMetaBufferMode = 0x7F00001C, /*"OMX.google.android.index.useAndroidNativeBuffer2"*/ OMX_GoogleAndroidIndexUseAndroidNativeBuffer2 = 0x7F00001D, diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index cb176f13..5b9757ce 100755 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1882,7 +1882,7 @@ OMX_ERRORTYPE omx_video::get_extension_index(OMX_IN OMX_HANDLETYPE hComp, #endif #ifdef _ANDROID_ICS_ if (!strncmp(paramName, "OMX.google.android.index.storeMetaDataInBuffers",sizeof("OMX.google.android.index.storeMetaDataInBuffers") - 1)) { - *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamVideoEncodeMetaBufferMode; + *indexType = (OMX_INDEXTYPE)OMX_QcomIndexParamVideoMetaBufferMode; return OMX_ErrorNone; } #endif diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp index 7893a385..ca7b6a7d 100755 --- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp @@ -969,11 +969,11 @@ OMX_ERRORTYPE omx_venc::set_parameter(OMX_IN OMX_HANDLETYPE hComp, break; } #ifdef _ANDROID_ICS_ - case OMX_QcomIndexParamVideoEncodeMetaBufferMode: + case OMX_QcomIndexParamVideoMetaBufferMode: { StoreMetaDataInBuffersParams *pParam = (StoreMetaDataInBuffersParams*)paramData; - DEBUG_PRINT_HIGH("set_parameter:OMX_QcomIndexParamVideoEncodeMetaBufferMode: " + DEBUG_PRINT_HIGH("set_parameter:OMX_QcomIndexParamVideoMetaBufferMode: " "port_index = %lu, meta_mode = %d", pParam->nPortIndex, pParam->bStoreMetaData); if (pParam->nPortIndex == PORT_INDEX_IN) { if (pParam->bStoreMetaData != meta_mode_enable) { |