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

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

Merge "MediaCodec: manage resources for hardware audio codecs" am: ea2199d3... 

Merge "MediaCodec: manage resources for hardware audio codecs" am: ea2199d3 am: 959ffc50 am: 91b047a2

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

Change-Id: I326e27f209ba425b7482b76c7eb49b3b0a4c509f
parents a03cec86 91b047a2

media/libstagefright/MediaCodec.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -3185,8 +3185,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                        mediametrics_setInt32(mMetricsHandle, kCodecSecure, 0);

                        mediametrics_setInt32(mMetricsHandle, kCodecSecure, 0);

                    }

                    }





                    if (mIsVideo) {

                    MediaCodecInfo::Attributes attr = mCodecInfo

                        // audio codec is currently ignored.

                            ? mCodecInfo->getAttributes()

                            : MediaCodecInfo::Attributes(0);

                    if (!(attr & MediaCodecInfo::kFlagIsSoftwareOnly)) {

                        // software codec is currently ignored.

                        mResourceManagerProxy->addResource(

                        mResourceManagerProxy->addResource(

                                MediaResource::CodecResource(mFlags & kFlagIsSecure, mIsVideo));

                                MediaResource::CodecResource(mFlags & kFlagIsSecure, mIsVideo));

                    }

                    }