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

Commit 7572e71f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix no tunning param case" am: 0c1eecbd 

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



Change-Id: Ic5807f90ec01005b12ed4a6011dded6102772ea8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e1bf258 0c1eecbd

media/libstagefright/MediaCodec.cpp

+10 −7
Original line number Diff line number Diff line
@@ -2495,7 +2495,9 @@ status_t MediaCodec::queueBuffer( 
    msg->setObject("c2buffer", obj);

    msg->setInt64("timeUs", presentationTimeUs);

    msg->setInt32("flags", flags);

    if (tunings && tunings->countEntries() > 0) {

        msg->setMessage("tunings", tunings);

    }

    msg->setPointer("errorDetailMsg", errorDetailMsg);



    sp<AMessage> response;
@@ -2537,7 +2539,9 @@ status_t MediaCodec::queueEncryptedBuffer( 
    msg->setInt32("skipBlocks", pattern.mSkipBlocks);

    msg->setInt64("timeUs", presentationTimeUs);

    msg->setInt32("flags", flags);

    if (tunings && tunings->countEntries() > 0) {

        msg->setMessage("tunings", tunings);

    }

    msg->setPointer("errorDetailMsg", errorDetailMsg);



    sp<AMessage> response;
@@ -4718,12 +4722,10 @@ status_t MediaCodec::queueCSDInputBuffer(size_t bufferIndex) { 
        sp<WrapperObject<std::shared_ptr<C2Buffer>>> obj{

            new WrapperObject<std::shared_ptr<C2Buffer>>{c2Buffer}};

        msg->setObject("c2buffer", obj);

        msg->setMessage("tunings", new AMessage);

    } else if (memory) {

        sp<WrapperObject<sp<hardware::HidlMemory>>> obj{

            new WrapperObject<sp<hardware::HidlMemory>>{memory}};

        msg->setObject("memory", obj);

        msg->setMessage("tunings", new AMessage);

    }



    return onQueueInputBuffer(msg);
@@ -4905,9 +4907,10 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 
    sp<MediaCodecBuffer> buffer = info->mData;



    if (c2Buffer || memory) {

        sp<AMessage> tunings;

        CHECK(msg->findMessage("tunings", &tunings));

        sp<AMessage> tunings = NULL;

        if (msg->findMessage("tunings", &tunings) && tunings != NULL) {

            onSetParameters(tunings);

        }



        status_t err = OK;

        if (c2Buffer) {