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

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

Snap for 13129673 from 4a5df021 to 25Q2-release 

Change-Id: Ib0637c29f74fc440c19f0607936e4cf906e50986
parents 4eb53162 4a5df021

drm/OWNERS

+0 −1
Original line number Diff line number Diff line 
jtinker@google.com

kelzhan@google.com

robertshih@google.com

include/OWNERS

+0 −1
Original line number Diff line number Diff line 
elaurent@google.com

hunga@google.com

jtinker@google.com

lajos@google.com

essick@google.com

philburk@google.com

include/mediadrm/OWNERS

+0 −1
Original line number Diff line number Diff line 
jtinker@google.com

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+3 −3
Original line number Diff line number Diff line
@@ -593,9 +593,9 @@ inline constexpr int32_t APVProfile422_10HDR10Plus = 0x2000; 


inline static const char *asString_APVProfile(int32_t i, const char *def = "??") {

    switch (i) {

        case APVProfile422_10:           return "APVProfile422_10";

        case APVProfile422_10HDR10:      return "APVProfile422_10HDR10";

        case APVProfile422_10HDR10Plus:  return "APVProfile422_10HDR10Plus";

        case APVProfile422_10:           return "422_10";

        case APVProfile422_10HDR10:      return "422_10HDR10";

        case APVProfile422_10HDR10Plus:  return "422_10HDR10Plus";

        default:                        return def;

    }

}

services/audioflinger/Tracks.cpp

+8 −4
Original line number Diff line number Diff line
@@ -2126,7 +2126,9 @@ status_t Track::getPlaybackRateParameters( 
        if (thread != nullptr) {

            auto* const t = thread->asIAfPlaybackThread().get();

            audio_utils::lock_guard lock(t->mutex());

            status = t->getOutput_l()->stream->getPlaybackRateParameters(playbackRate);

            if (auto* const output = t->getOutput_l()) {

                status = output->stream->getPlaybackRateParameters(playbackRate);

            }

            ALOGD_IF((status == NO_ERROR) &&

                    !isAudioPlaybackRateEqual(mPlaybackRateParameters, *playbackRate),

                    "%s: playbackRate inconsistent", __func__);
@@ -2144,12 +2146,14 @@ status_t Track::setPlaybackRateParameters( 
        if (thread != nullptr) {

            auto* const t = thread->asIAfPlaybackThread().get();

            audio_utils::lock_guard lock(t->mutex());

            status = t->getOutput_l()->stream->setPlaybackRateParameters(playbackRate);

            if (auto* const output = t->getOutput_l()) {

                status = output->stream->setPlaybackRateParameters(playbackRate);

                if (status == NO_ERROR) {

                    mPlaybackRateParameters = playbackRate;

                }

            }

        }

    }

    return status;

}