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

Commit 2c83efe4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable reuse of LinearBlock for during secure playback" into main am: d666832c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039900



Change-Id: I2f7b0d18170a86d2453de52e93ddfc2e4f39c2c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d00c53bb d666832c

media/jni/android_media_MediaCodec.cpp

+17 −10
Original line number Diff line number Diff line
@@ -2886,6 +2886,10 @@ static void extractMemoryFromContext( 
        jint offset,

        jint size,

        sp<hardware::HidlMemory> *memory) {

    if ((offset + size) > context->capacity()) {

        ALOGW("extractMemoryFromContext: offset + size provided exceed capacity");

        return;

    }

    *memory = context->toHidlMemory();

    if (*memory == nullptr) {

        if (!context->mBlock) {
@@ -2899,17 +2903,20 @@ static void extractMemoryFromContext( 
            ALOGW("extractMemoryFromContext: failed to obtain secure block");

            return;

        }

        C2WriteView view = context->mBlock->map().get();

        if (view.error() != C2_OK) {

            ALOGW("extractMemoryFromContext: failed to map C2Block (%d)", view.error());

        *memory = context->toHidlMemory();

    }

    if (context->mBlock == nullptr || context->mReadWriteMapping == nullptr) {

        ALOGW("extractMemoryFromContext: Cannot extract memory as C2Block is not created/mapped");

        return;

    }

        uint8_t *memoryPtr = static_cast<uint8_t *>(context->mMemory->unsecurePointer());

        memcpy(memoryPtr + offset, view.base() + offset, size);

        context->mBlock.reset();

        context->mReadWriteMapping.reset();

        *memory = context->toHidlMemory();

    if (context->mReadWriteMapping->error() != C2_OK) {

        ALOGW("extractMemoryFromContext: failed to map C2Block (%d)",

                context->mReadWriteMapping->error());

        return;

    }

    // We are proceeding to extract memory from C2Block

    uint8_t *memoryPtr = static_cast<uint8_t *>(context->mMemory->unsecurePointer());

    memcpy(memoryPtr + offset, context->mReadWriteMapping->base() + offset, size);

}



static void extractBufferFromContext(