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

Commit 93ee0e45 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "CCodec: output format duplicated at CCodecConfig" am: 26a5773f am: 71e8b096 

Change-Id: I607b13805a8988aaaf6047c43533c5da62097b78
parents c0e90edc 71e8b096

media/codec2/sfplugin/CCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,8 @@ void CCodec::start() { 
        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

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

        inputFormat = config->mInputFormat;

        outputFormat = config->mOutputFormat;

        // start triggers format dup

        outputFormat = config->mOutputFormat = config->mOutputFormat->dup();

        if (config->mInputSurface) {

            err2 = config->mInputSurface->start();

        }

media/codec2/sfplugin/CCodecBufferChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ status_t CCodecBufferChannel::start( 
        } else {

            output->buffers.reset(new LinearOutputBuffers(mName));

        }

        output->buffers->setFormat(outputFormat->dup());

        output->buffers->setFormat(outputFormat);





        // Try to set output surface to created block pool if given.