commit 1d94733b9d55649ca23b3cc7c95300d226ff4a4b
author Wonsik Kim <wonsik@google.com> Thu Sep 02 19:25:43 2021 -0700
committer Wonsik Kim <wonsik@google.com> Thu Sep 02 19:25:43 2021 -0700
tree e4259214fe515025ded1d43ad36e7384a5b83341
parent 918f4ad205cf99c70dd9ebcf3b6e109146b644f5

MediaCodec: manage resources for hardware audio codecs

Bug: 191447420
Test: cts/media/device-small
Change-Id: I9e40f8fefcfffada6fe174b2543dfd6e7624f7e4

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 061bb85..6fda263 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2506,8 +2506,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));
                     }