commit 8182e4822e41dbd696b0e149b69b2c0988d24351
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 10 23:24:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 10 23:24:50 2021 +0000
tree b6046b7bc2aea8dd916a84e9f491c5f98687128e
parent 1ad8576127e6887ca4fa52758c86b3403a2de9ed
parent 1904aa972fd1d3d9b49e7875ebf13cbc9ed72333

Merge "MediaCodec: manage resources for hardware audio codecs" am: ea2199d39a am: 959ffc50c4 am: 91b047a268 am: 6b5548d488 am: 1904aa972f

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

Change-Id: Iea67657c0e47a798ef790eafe889e9997156ab9b

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index a366506..4593668 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -3185,8 +3185,11 @@
                         mediametrics_setInt32(mMetricsHandle, kCodecSecure, 0);
                     }
 
-                    if (mIsVideo) {
-                        // audio codec is currently ignored.
+                    MediaCodecInfo::Attributes attr = mCodecInfo
+                            ? mCodecInfo->getAttributes()
+                            : MediaCodecInfo::Attributes(0);
+                    if (!(attr & MediaCodecInfo::kFlagIsSoftwareOnly)) {
+                        // software codec is currently ignored.
                         mResourceManagerProxy->addResource(
                                 MediaResource::CodecResource(mFlags & kFlagIsSecure, mIsVideo));
                     }