commit b2626e9dc50e61c2301035f86bd0915be0431b1f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 04 01:28:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 04 01:28:14 2021 +0000
tree 6d9d89c88da4a2ac8d9a1c720e97c0f8f3c43483
parent df6e1b24a9e6116398aa860797aeb13bfec0d004
parent bb9c5e15751a25241a172f02415cdf8793d5b01c

Merge "MediaCodecListOverrides_test: Remove compile_multilib" am: bb9c5e1575

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2621d27a82e1cc4fcee01fc568fa30ae3fd7d7d

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 4fe871f..0ed0de1 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() {
@@ -3122,7 +3123,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());