commit e52c0ff952a6aaafa0f6e6633b574c5e66c3c0f4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 17 20:59:11 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 17 20:59:11 2022 +0000
tree 116886bd8302e10c95bfc30a8104280fa3e32e12
parent 70d8e4cad11fd90b1e02049e4ed37898213e8ec1
parent 897b3751c4f0e6610f7a3f963539c407cef08b2e

Merge "MediaCodec: manage resources for sw video codecs"

media/libstagefright/MediaCodec.cpp

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