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

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

Snap for 8768686 from 80c881ae to tm-d1-release 

Change-Id: Ifd34d5bf0642b06f610ca1e55afb1e58c7b2c322
parents 660d4f3a 80c881ae

media/codec2/sfplugin/Codec2InfoBuilder.cpp

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

    // dynamic metadata as that needs to be frame accurate.)

    supportsHdr |= (mediaType == MIMETYPE_VIDEO_VP9);

    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

    // 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

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

    // can advertise support for HDR profiles.

    // can advertise support for HDR profiles.

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

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

        if (mPowerManager != NULL) {

            sp<IBinder> binder = new BBinder();

            sp<IBinder> binder = new BBinder();

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

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

            binder::Status status = mPowerManager->acquireWakeLock(

            binder::Status status = mPowerManager->acquireWakeLockAsync(

                    binder, POWERMANAGER_PARTIAL_WAKE_LOCK,

                    binder, POWERMANAGER_PARTIAL_WAKE_LOCK,

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

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

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

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

                    nullptr /* callback */);

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

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

            if (status.isOk()) {

            if (status.isOk()) {

                mWakeLockToken = binder;

                mWakeLockToken = binder;