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

Unverified Commit da856375 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r29' of... 

Merge tag 'android-11.0.0_r29' of https://android.googlesource.com/platform/frameworks/av into staging/lineage-18.1_merge-android-11.0.0_r29

Android 11.0.0 release 29

* tag 'android-11.0.0_r29' of https://android.googlesource.com/platform/frameworks/av:
  MediaCodec: propagate usage from original surface to release surface

Change-Id: I682c0b6df76f6ef9e2792f3522d20ac20b5a8f9d
parents 5d8296f5 d677162f

media/libstagefright/MediaCodec.cpp

+7 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ MediaCodec::BufferInfo::BufferInfo() : mOwnedByClient(false) {} 


class MediaCodec::ReleaseSurface {

public:

    ReleaseSurface() {

    explicit ReleaseSurface(uint64_t usage) {

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

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

        struct ConsumerListener : public BnConsumerListener {
@@ -325,6 +325,7 @@ public: 
        sp<ConsumerListener> listener{new ConsumerListener};

        mConsumer->consumerConnect(listener, false);

        mConsumer->setConsumerName(String8{"MediaCodec.release"});

        mConsumer->setConsumerUsageBits(usage);

    }



    const sp<Surface> &getSurface() {
@@ -3001,7 +3002,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            if (msg->findMessage("async", &asyncNotify) && asyncNotify != nullptr) {

                if (mSurface != NULL) {

                    if (!mReleaseSurface) {

                        mReleaseSurface.reset(new ReleaseSurface);

                        uint64_t usage = 0;

                        if (mSurface->getConsumerUsage(&usage) != OK) {

                            usage = 0;

                        }

                        mReleaseSurface.reset(new ReleaseSurface(usage));

                    }

                    if (mSurface != mReleaseSurface->getSurface()) {

                        status_t err = connectToSurface(mReleaseSurface->getSurface());