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

Commit 7db16c12 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11130229 from de803dbb to 24Q1-release 

Change-Id: Id31788e3c5b6494bc3f41bee1f770a99f8f94b37
parents 38245db9 de803dbb

camera/cameraserver/manifest_android.frameworks.cameraservice.service.xml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


    <hal format="aidl">

        <name>android.frameworks.cameraservice.service</name>

        <version>1</version>

        <version>2</version>

        <interface>

            <name>ICameraService</name>

            <instance>default</instance>

media/codec2/hal/aidl/BufferTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ bool objcpy(C2Fence* d, const AidlNativeHandle& s) { 


template<>

void SetHandle(BaseBlock *block, const C2Handle *handle) {

    block->set<BaseBlock::nativeBlock>(makeToAidl(handle));

    block->set<BaseBlock::nativeBlock>(dupToAidl(handle));

}



template<>

media/codec2/hal/client/client.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,11 @@ void Codec2Client::Component::stopUsingOutputSurface( 
    mOutputBufferQueue->expireOldWaiters();

}



void Codec2Client::Component::onBufferReleasedFromOutputSurface(

        uint32_t generation) {

    (void) generation;

}



c2_status_t Codec2Client::Component::connectToInputSurface(

        const std::shared_ptr<InputSurface>& inputSurface,

        std::shared_ptr<InputSurfaceConnection>* connection) {

media/codec2/hal/client/include/codec2/hidl/client.h

+4 −0
Original line number Diff line number Diff line
@@ -474,6 +474,10 @@ struct Codec2Client::Component : public Codec2Client::Configurable { 
    void stopUsingOutputSurface(

            C2BlockPool::local_id_t blockPoolId);



    // Notify a buffer is released from output surface.

    void onBufferReleasedFromOutputSurface(

            uint32_t generation);



    // Connect to a given InputSurface.

    c2_status_t connectToInputSurface(

            const std::shared_ptr<InputSurface>& inputSurface,

media/codec2/hal/common/include/codec2/common/BufferTypes.h

+24 −21
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ bool addBaseBlock( 
                baseBlocks, baseBlockIndices);

    }

    switch (blockPoolData->getType()) {

    case _C2BlockPoolData::TYPE_BUFFERPOOL: {

    case _C2BlockPoolData::TYPE_BUFFERPOOL:

    case _C2BlockPoolData::TYPE_BUFFERPOOL2: {

            // BufferPoolData

            std::shared_ptr<typename BufferPoolTypes::BufferPoolData> bpData;

            if (!GetBufferPoolData<BufferPoolTypes>(blockPoolData, &bpData) || !bpData) {
@@ -194,7 +195,7 @@ bool addBaseBlock( 
                    index, bpData,

                    bufferPoolSender, baseBlocks, baseBlockIndices);

        }

    case _C2BlockPoolData::TYPE_BUFFERQUEUE:

    case _C2BlockPoolData::TYPE_BUFFERQUEUE: {

            uint32_t gen;

            uint64_t bqId;

            int32_t bqSlot;
@@ -207,7 +208,8 @@ bool addBaseBlock( 
            return _addBaseBlock(

                    index, handle,

                    baseBlocks, baseBlockIndices);

    case _C2BlockPoolData::TYPE_AHWBUFFER:

        }

    case _C2BlockPoolData::TYPE_AHWBUFFER: {

            AHardwareBuffer *pBuf;

            if (!_C2BlockFactory::GetAHardwareBuffer(blockPoolData, &pBuf)) {

                LOG(ERROR) << "AHardwareBuffer unavailable in a block.";
@@ -216,6 +218,7 @@ bool addBaseBlock( 
            return _addBaseBlock(

                    index, pBuf,

                    baseBlocks, baseBlockIndices);

        }

    default:

        LOG(ERROR) << "Unknown C2BlockPoolData type.";

        return false;