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

Commit 4c6d9952 authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "codec2: wait for fence in VideoNativeMetadata" into qt-dev 

am: c3fa11b6

Change-Id: I14d50439e90173bda1bda833e083c5b14a8c59f0
parents 16f67232 c3fa11b6

media/codec2/sfplugin/Codec2Buffer.cpp

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <media/stagefright/foundation/AMessage.h>

#include <media/stagefright/foundation/AUtils.h>

#include <nativebase/nativebase.h>

#include <ui/Fence.h>



#include <C2AllocatorGralloc.h>

#include <C2BlockInternal.h>
@@ -590,7 +591,12 @@ std::shared_ptr<C2Buffer> GraphicMetadataBuffer::asC2Buffer() { 
    std::shared_ptr<C2GraphicBlock> block = _C2BlockFactory::CreateGraphicBlock(alloc);



    meta->pBuffer = 0;

    // TODO: fence

    // TODO: wrap this in C2Fence so that the component can wait when it

    //       actually starts processing.

    if (meta->nFenceFd >= 0) {

        sp<Fence> fence(new Fence(meta->nFenceFd));

        fence->waitForever(LOG_TAG);

    }

    return C2Buffer::CreateGraphicBuffer(

            block->share(C2Rect(buffer->width, buffer->height), C2Fence()));

#else