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

Commit 2260c5b6 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Fix a race condition in... 

Merge "Fix a race condition in CCodecBufferChannel::requestInitialInputBuffers" into main am: 3d1e0c86 am: f83df4c6

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



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

media/codec2/sfplugin/CCodecBufferChannel.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2052,6 +2052,14 @@ status_t CCodecBufferChannel::prepareInitialInputBuffers( 


status_t CCodecBufferChannel::requestInitialInputBuffers(

        std::map<size_t, sp<MediaCodecBuffer>> &&clientInputBuffers) {

    std::optional<QueueGuard> guard;

    if (android::media::codec::provider_->codec_buffer_state_cleanup()) {

        guard.emplace(mSync);

        if (!guard->isRunning()) {

            ALOGD("[%s] skip requestInitialInputBuffers when not running", mName);

            return OK;

        }

    }

    C2StreamBufferTypeSetting::output oStreamFormat(0u);

    C2PrependHeaderModeSetting prepend(PREPEND_HEADER_TO_NONE);

    c2_status_t err = mComponent->query({ &oStreamFormat, &prepend }, {}, C2_DONT_BLOCK, nullptr);