diff options
| author | James Dong <jdong@google.com> | 2011-06-10 09:57:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-10 09:57:01 -0700 |
| commit | be674b18644cda56ba56a78ac7147711861e8dc8 (patch) | |
| tree | e5296932499a67d51e1ab1bbc8c04b0e8e90df9b | |
| parent | d24f94989fe5e78b82af261727d3c2ba11639772 (diff) | |
| parent | 7d6143a9f01418e84db285b0202d8b1657bb6e8e (diff) | |
| download | frameworks_base-be674b18644cda56ba56a78ac7147711861e8dc8.zip frameworks_base-be674b18644cda56ba56a78ac7147711861e8dc8.tar.gz frameworks_base-be674b18644cda56ba56a78ac7147711861e8dc8.tar.bz2 | |
Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 9c69a6f..72d0d08 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1643,25 +1643,26 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { return PERMISSION_DENIED; } + status_t err = OK; + if (mIsMetaDataStoredInVideoBuffers && portIndex == kPortIndexInput) { + err = mOMX->storeMetaDataInBuffers(mNode, kPortIndexInput, OMX_TRUE); + if (err != OK) { + LOGE("Storing meta data in video buffers is not supported"); + return err; + } + } + OMX_PARAM_PORTDEFINITIONTYPE def; InitOMXParams(&def); def.nPortIndex = portIndex; - status_t err = mOMX->getParameter( + err = mOMX->getParameter( mNode, OMX_IndexParamPortDefinition, &def, sizeof(def)); if (err != OK) { return err; } - if (mIsMetaDataStoredInVideoBuffers && portIndex == kPortIndexInput) { - err = mOMX->storeMetaDataInBuffers(mNode, kPortIndexInput, OMX_TRUE); - if (err != OK) { - LOGE("Storing meta data in video buffers is not supported"); - return err; - } - } - CODEC_LOGI("allocating %lu buffers of size %lu on %s port", def.nBufferCountActual, def.nBufferSize, portIndex == kPortIndexInput ? "input" : "output"); |