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

Commit 560fa767 authored by Houxiang Dai's avatar Houxiang Dai
Browse files

Fix no tunning param case 

If tuning param is NULL, no need setParameters in MediaCodec any more

Test:
DTV playback OK

Bug: 234105296
Change-Id: Ib0ab1f2996be57e2adbbabf04a8b4cd091abf57a
parent 339415e6

media/libstagefright/MediaCodec.cpp

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

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

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

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

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

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

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

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

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

    }

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

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





    sp<AMessage> response;

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

    msg->setInt32("skipBlocks", pattern.mSkipBlocks);

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

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

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

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

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

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

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

    }

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

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





    sp<AMessage> response;

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

        sp<WrapperObject<std::shared_ptr<C2Buffer>>> obj{

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

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

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

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

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

    } else if (memory) {

    } else if (memory) {

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

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

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

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

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

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

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

    }

    }





    return onQueueInputBuffer(msg);

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

    sp<MediaCodecBuffer> buffer = info->mData;





    if (c2Buffer || memory) {

    if (c2Buffer || memory) {

        sp<AMessage> tunings;

        sp<AMessage> tunings = NULL;

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

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

            onSetParameters(tunings);

            onSetParameters(tunings);

        }





        status_t err = OK;

        status_t err = OK;

        if (c2Buffer) {

        if (c2Buffer) {