commit 789055bbcb4560b42faf19103b1cda5534e8f9cb
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 05 03:49:01 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 05 03:49:01 2020 +0000
tree 012c6c59c6dfc1e3157f6d78623966a3ad4980a7
parent 936718f931eb50cefccd0c2e1862c4d802c2af3b
parent 902f750fa341aefa0d2857c9eb7c367d2310c8d5

Merge "MediaCodec: propagate usage from original surface to release surface" into rvc-dev am: 68aa6aad3e am: 902f750fa3

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

Change-Id: I10a85c31d7a84dbc1cd4f556f7b8d3c97c91db12

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 3e191fe..4d617ae 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -317,7 +317,7 @@
 
 class MediaCodec::ReleaseSurface {
 public:
-    ReleaseSurface() {
+    explicit ReleaseSurface(uint64_t usage) {
         BufferQueue::createBufferQueue(&mProducer, &mConsumer);
         mSurface = new Surface(mProducer, false /* controlledByApp */);
         struct ConsumerListener : public BnConsumerListener {
@@ -328,6 +328,7 @@
         sp<ConsumerListener> listener{new ConsumerListener};
         mConsumer->consumerConnect(listener, false);
         mConsumer->setConsumerName(String8{"MediaCodec.release"});
+        mConsumer->setConsumerUsageBits(usage);
     }
 
     const sp<Surface> &getSurface() {
@@ -3111,7 +3112,11 @@
             if (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());