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

Commit 1a1aa414 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "CCodec: read formats after setupInputSurface" am: 8b599a8d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1701926

Change-Id: I1098fa28ca5a44d403a47ed958efa68111c8097d
parents 88a9462b 8b599a8d

media/codec2/sfplugin/CCodec.cpp

+16 −4
Original line number Diff line number Diff line
@@ -1479,13 +1479,11 @@ void CCodec::createInputSurface() { 
    status_t err;

    sp<IGraphicBufferProducer> bufferProducer;



    sp<AMessage> inputFormat;

    sp<AMessage> outputFormat;

    uint64_t usage = 0;

    {

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;

        inputFormat = config->mInputFormat;

        outputFormat = config->mOutputFormat;

        usage = config->mISConfig ? config->mISConfig->mUsage : 0;

    }
@@ -1521,6 +1519,14 @@ void CCodec::createInputSurface() { 
        return;

    }



    // Formats can change after setupInputSurface

    sp<AMessage> inputFormat;

    {

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;

        inputFormat = config->mInputFormat;

        outputFormat = config->mOutputFormat;

    }

    mCallback->onInputSurfaceCreated(

            inputFormat,

            outputFormat,
@@ -1570,13 +1576,11 @@ void CCodec::initiateSetInputSurface(const sp<PersistentSurface> &surface) { 
}



void CCodec::setInputSurface(const sp<PersistentSurface> &surface) {

    sp<AMessage> inputFormat;

    sp<AMessage> outputFormat;

    uint64_t usage = 0;

    {

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;

        inputFormat = config->mInputFormat;

        outputFormat = config->mOutputFormat;

        usage = config->mISConfig ? config->mISConfig->mUsage : 0;

    }
@@ -1608,6 +1612,14 @@ void CCodec::setInputSurface(const sp<PersistentSurface> &surface) { 
        mCallback->onInputSurfaceDeclined(UNKNOWN_ERROR);

        return;

    }

    // Formats can change after setupInputSurface

    sp<AMessage> inputFormat;

    {

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;

        inputFormat = config->mInputFormat;

        outputFormat = config->mOutputFormat;

    }

    mCallback->onInputSurfaceAccepted(inputFormat, outputFormat);

}