commit 6b5548d48812e90b648fa4f7c90e54c58d3f9a01
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 10 23:06:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 10 23:06:32 2021 +0000
tree d3e157afa74a29ef173ccf435f2da1d094cd2ac0
parent a03cec860cc08f80dfacf8b6f3d1176ef5e71d34
parent 91b047a26833e1714927efbdbbf0bd24abe7c120

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

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

Change-Id: I326e27f209ba425b7482b76c7eb49b3b0a4c509f

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index c03236a..759592b 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));
                     }