Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e877bf1b authored by Sanjay Singh's avatar Sanjay Singh Committed by android-build-merger
Browse files

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

am: e41dfae5

Change-Id: Ib857ac1561aa8cffd22574fb7a8f76869e67b903
parents 4e5ada70 e41dfae5

media/libstagefright/omx/OMXNodeInstance.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1063,7 +1063,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);
@@ -1078,7 +1079,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);
@@ -1093,7 +1095,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;

}