commit 936c299d0da298c3a5348ca92797838e58b3373d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 17 21:22:17 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 17 21:22:17 2022 +0000
tree a8ad70072f44481e0e27e1cdfe22580c5fd01d02
parent d6a5d476a2ba21b1246dc4af3f130459326c8674
parent e52c0ff952a6aaafa0f6e6633b574c5e66c3c0f4

Merge "MediaCodec: manage resources for sw video codecs" am: e52c0ff952

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

Change-Id: I14a84ae90a1ccbee898e833550bf1070bba0f2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 6ef52c7..ad6e36a 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -3355,8 +3355,8 @@
                     MediaCodecInfo::Attributes attr = mCodecInfo
                             ? mCodecInfo->getAttributes()
                             : MediaCodecInfo::Attributes(0);
-                    if (!(attr & MediaCodecInfo::kFlagIsSoftwareOnly)) {
-                        // software codec is currently ignored.
+                    if (mDomain == DOMAIN_VIDEO || !(attr & MediaCodecInfo::kFlagIsSoftwareOnly)) {
+                        // software audio codecs are currently ignored.
                         mResourceManagerProxy->addResource(MediaResource::CodecResource(
                             mFlags & kFlagIsSecure, toMediaResourceSubType(mDomain)));
                     }