commit e877bf1ba7d8f8d6ccc4820b1d0ac73b12b5b173
author Sanjay Singh <sisanj@codeaurora.org> Tue Jun 05 14:39:05 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 14:39:05 2018 -0700
tree 09c9b6725ea038bd49aed82c1f894c11b7c7a5c5
parent 4e5ada70a56be96f2cc9329f14f2e7a7a8430497
parent e41dfae5d57bd2f0271a0603a2657cafa4eabe35

Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev
am: e41dfae5d5

Change-Id: Ib857ac1561aa8cffd22574fb7a8f76869e67b903

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 63c1c80..30cee23 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1063,7 +1063,8 @@
         }
 
         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);
@@ -1078,7 +1079,8 @@
 
         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);
@@ -1093,7 +1095,8 @@
             break;
     }
 
-    ALOGE("b/77486542");
+    ALOGE("b/77486542 : bufferType = %d vs. portMode = %d",
+          omxBuffer.mBufferType, mPortMode[portIndex]);
     android_errorWriteLog(0x534e4554, "77486542");
     return INVALID_OPERATION;
 }