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

Commit bf6c85a0 authored by Andreas Huber's avatar Andreas Huber
Browse files

Fix two more locations that use the old setObject("buffer", ...) paradigm 

that I'd previously missed.

Change-Id: Ifbdbfb94d1bc1cbe8c0a403fed05ce99fca8397b
parent 54263bcf

cmds/stagefright/codec.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -107,9 +107,8 @@ static int decode( 
        CHECK_EQ(err, (status_t)OK);

        CHECK_EQ(err, (status_t)OK);





        size_t j = 0;

        size_t j = 0;

        sp<RefBase> obj;

        sp<ABuffer> buffer;

        while (format->findObject(StringPrintf("csd-%d", j).c_str(), &obj)) {

        while (format->findBuffer(StringPrintf("csd-%d", j).c_str(), &buffer)) {

            sp<ABuffer> buffer = static_cast<ABuffer *>(obj.get());

            state->mCSD.push_back(buffer);

            state->mCSD.push_back(buffer);





            ++j;

            ++j;

cmds/stagefright/sf2.cpp

+6 −8
Original line number Original line Diff line number Diff line
@@ -358,7 +358,7 @@ private: 
            buffer->meta()->setInt32("csd", true);

            buffer->meta()->setInt32("csd", true);

            mCSD.push(buffer);

            mCSD.push(buffer);





            msg->setObject("csd", buffer);

            msg->setBuffer("csd", buffer);

        } else if (meta->findData(kKeyESDS, &type, &data, &size)) {

        } else if (meta->findData(kKeyESDS, &type, &data, &size)) {

            ESDS esds((const char *)data, size);

            ESDS esds((const char *)data, size);

            CHECK_EQ(esds.InitCheck(), (status_t)OK);

            CHECK_EQ(esds.InitCheck(), (status_t)OK);
@@ -408,9 +408,8 @@ private: 
            return;

            return;

        }

        }





        sp<RefBase> obj;

        sp<ABuffer> outBuffer;

        CHECK(msg->findObject("buffer", &obj));

        CHECK(msg->findBuffer("buffer", &outBuffer));

        sp<ABuffer> outBuffer = static_cast<ABuffer *>(obj.get());





        if (mCSDIndex < mCSD.size()) {

        if (mCSDIndex < mCSD.size()) {

            outBuffer = mCSD.editItemAt(mCSDIndex++);

            outBuffer = mCSD.editItemAt(mCSDIndex++);
@@ -509,15 +508,14 @@ private: 
            }

            }

        }

        }





        reply->setObject("buffer", outBuffer);

        reply->setBuffer("buffer", outBuffer);

        reply->post();

        reply->post();

    }

    }





    void onDrainThisBuffer(const sp<AMessage> &msg) {

    void onDrainThisBuffer(const sp<AMessage> &msg) {

        sp<RefBase> obj;

        sp<ABuffer> buffer;

        CHECK(msg->findObject("buffer", &obj));

        CHECK(msg->findBuffer("buffer", &buffer));





        sp<ABuffer> buffer = static_cast<ABuffer *>(obj.get());

        mTotalBytesReceived += buffer->size();

        mTotalBytesReceived += buffer->size();





        sp<AMessage> reply;

        sp<AMessage> reply;