diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-28 00:35:32 +0000 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-28 00:35:32 +0000 |
| commit | 8e9fdc3254721b488ebdb9e9e62fb2d99eac392d (patch) | |
| tree | 68c480a09518735e327c2c9355161df75ddcad0b /mm-video-v4l2/vidc/venc/src | |
| parent | 160217c89a692e1d8a617a7dbfba36196cf604b5 (diff) | |
| download | android_hardware_qcom_media-8e9fdc3254721b488ebdb9e9e62fb2d99eac392d.tar.gz android_hardware_qcom_media-8e9fdc3254721b488ebdb9e9e62fb2d99eac392d.tar.bz2 android_hardware_qcom_media-8e9fdc3254721b488ebdb9e9e62fb2d99eac392d.zip | |
Revert "Revert "mm-video: vidc: make extended index for meta buffer mode generic""
This reverts commit 160217c89a692e1d8a617a7dbfba36196cf604b5.
Change-Id: I0941493ad8e7566303baeec2572c79d30f8bb62a
Diffstat (limited to 'mm-video-v4l2/vidc/venc/src')
| -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 |
2 files changed, 3 insertions, 3 deletions
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) { |