commit 91b047a26833e1714927efbdbbf0bd24abe7c120
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 10 22:55:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 10 22:55:09 2021 +0000
tree 36f7e239f61132f3280960b9a901715e77e42ffb
parent 01ab542269bd46e7d17833ae3d4ae7cf2686ff86
parent 959ffc50c4596562fbc17b536c5e3498a3a5bed5

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

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

Change-Id: I483ec699207b4251f68eed4a6028c1b87f04caf8

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));
                     }