diff options
| author | Sanjay Singh <sisanj@codeaurora.org> | 2018-06-05 15:40:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-05 15:40:34 -0700 |
| commit | c034b4b204a7c551fcfc6fa7b3fa298d071ff1d2 (patch) | |
| tree | 832d317e8fb1349932808f2da00745c991e2ff0e | |
| parent | 3ab5844df2059113ac24e6ddf627eca7161c9bd6 (diff) | |
| parent | e877bf1ba7d8f8d6ccc4820b1d0ac73b12b5b173 (diff) | |
| download | av-c034b4b204a7c551fcfc6fa7b3fa298d071ff1d2.tar.gz | |
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev am: e41dfae5d5
am: e877bf1ba7
Change-Id: I4b69d97ee171ad4ed68fcb76e5b633a2e805b463
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 4f38dee104..a9fbd71b3c 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -1077,7 +1077,8 @@ status_t OMXNodeInstance::useBuffer( } case OMXBuffer::kBufferTypeSharedMem: { - if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer) { + if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer + && mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) { break; } return useBuffer_l(portIndex, omxBuffer.mMem, NULL, buffer); @@ -1092,7 +1093,8 @@ status_t OMXNodeInstance::useBuffer( case OMXBuffer::kBufferTypeHidlMemory: { if (mPortMode[portIndex] != IOMX::kPortModePresetByteBuffer - && mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer) { + && mPortMode[portIndex] != IOMX::kPortModeDynamicANWBuffer + && mPortMode[portIndex] != IOMX::kPortModeDynamicNativeHandle) { break; } sp<IHidlMemory> hidlMemory = mapMemory(omxBuffer.mHidlMemory); @@ -1107,7 +1109,8 @@ status_t OMXNodeInstance::useBuffer( break; } - ALOGE("b/77486542"); + ALOGE("b/77486542 : bufferType = %d vs. portMode = %d", + omxBuffer.mBufferType, mPortMode[portIndex]); android_errorWriteLog(0x534e4554, "77486542"); return INVALID_OPERATION; } |