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

Commit 83aee36d authored by Jim Shargo's avatar Jim Shargo Committed by Android (Google) Code Review
Browse files

Merge "bufferqueues: Replace usage of BnConsumerListener with IConsumerListener" into main

parents a8f34d8a b62ae147

media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -591,9 +591,9 @@ TEST_P(Codec2VideoDecHidlTest, configureTunnel) { 
    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);



    class DummyConsumerListener : public BnConsumerListener {

    class DummyConsumerListener : public IConsumerListener {

      public:

        DummyConsumerListener() : BnConsumerListener() {}

        DummyConsumerListener() : IConsumerListener() {}

        void onFrameAvailable(const BufferItem&) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}

media/codec2/tests/aidl/GraphicsTracker_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -76,15 +76,15 @@ struct BqStatistics { 
    }

};



struct DummyConsumerListener : public android::BnConsumerListener {

struct DummyConsumerListener : public android::IConsumerListener {

    void onFrameAvailable(const BufferItem& /* item */) override {}

    void onBuffersReleased() override {}

    void onSidebandStreamChanged() override {}

};



struct TestConsumerListener : public android::BnConsumerListener {

struct TestConsumerListener : public android::IConsumerListener {

    TestConsumerListener(const sp<IGraphicBufferConsumer>& consumer)

            : BnConsumerListener(), mConsumer(consumer) {}

        : IConsumerListener(), mConsumer(consumer) {}

    void onFrameAvailable(const BufferItem&) override {

        constexpr static int kRenderDelayUs = 1000000/30; // 30fps

        BufferItem buffer;

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ public: 
    explicit ReleaseSurface(uint64_t usage) {

        BufferQueue::createBufferQueue(&mProducer, &mConsumer);

        mSurface = new Surface(mProducer, false /* controlledByApp */);

        struct ConsumerListener : public BnConsumerListener {

        struct ConsumerListener : public IConsumerListener {

            ConsumerListener(const sp<IGraphicBufferConsumer> &consumer) {

                mConsumer = consumer;

            }

media/libstagefright/MediaSync.cpp

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ status_t MediaSync::createInputSurface( 
    BufferQueue::createBufferQueue(&bufferProducer, &bufferConsumer);



    sp<InputListener> listener(new InputListener(this));

    IInterface::asBinder(bufferConsumer)->linkToDeath(listener);

    status_t status =

        bufferConsumer->consumerConnect(listener, false /* controlledByApp */);

    if (status == NO_ERROR) {

media/libstagefright/include/media/stagefright/MediaSync.h

+2 −3
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ private: 


    // This is a thin wrapper class that lets us listen to

    // IConsumerListener::onFrameAvailable from mInput.

    class InputListener : public BnConsumerListener,

                          public IBinder::DeathRecipient {

    class InputListener : public IConsumerListener, public IBinder::DeathRecipient {

      public:

        InputListener(const sp<MediaSync> &sync);

        virtual ~InputListener();