Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c250cdc2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: manage resources for sw video codecs" am: e52c0ff9 am: 936c299d 

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



Change-Id: I275d911d9f4ad0ddb59bbc80e0d9670d1d6c5d97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcaecaa8 936c299d

media/libstagefright/MediaCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3355,8 +3355,8 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                    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)));

                    }