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

Commit c034b4b2 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"... 

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

Change-Id: I4b69d97ee171ad4ed68fcb76e5b633a2e805b463
parents 3ab5844d e877bf1b

media/libstagefright/omx/OMXNodeInstance.cpp

+6 −3
Original line number Diff line number Diff line
@@ -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;

}