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

Commit 32350090 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19034945, 19053365] into tm-release. 

Change-Id: I6929310a81884fe142fe23fbf54dc01f05a547a9
parents f8d29813 a2d68d9f

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+3 −2
Original line number Diff line number Diff line
@@ -156,9 +156,10 @@ bool addSupportedProfileLevels( 
    // dynamic metadata as that needs to be frame accurate.)

    supportsHdr |= (mediaType == MIMETYPE_VIDEO_VP9);



    // HDR support implies 10-bit support.

    // HDR support implies 10-bit support. AV1 codecs are also required to

    // support 10-bit per CDD.

    // TODO: directly check this from the component interface

    supports10Bit = (supportsHdr || supportsHdr10Plus);

    supports10Bit = (supportsHdr || supportsHdr10Plus) || (mediaType == MIMETYPE_VIDEO_AV1);



    // If the device doesn't support HDR display, then no codec on the device

    // can advertise support for HDR profiles.

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

+2 −3
Original line number Diff line number Diff line
@@ -59,11 +59,10 @@ bool AWakeLock::acquire() { 
        if (mPowerManager != NULL) {

            sp<IBinder> binder = new BBinder();

            int64_t token = IPCThreadState::self()->clearCallingIdentity();

            binder::Status status = mPowerManager->acquireWakeLock(

            binder::Status status = mPowerManager->acquireWakeLockAsync(

                    binder, POWERMANAGER_PARTIAL_WAKE_LOCK,

                    String16("AWakeLock"), String16("media"),

                    {} /* workSource */, {} /* historyTag */, -1 /* displayId */,

                    nullptr /* callback */);

                    {} /* workSource */, {} /* historyTag */);

            IPCThreadState::self()->restoreCallingIdentity(token);

            if (status.isOk()) {

                mWakeLockToken = binder;