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

Commit 2a6038e5 authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "JAudioTrack: fix uninitialized mFlags"

parents c514e546 48c16234

media/libmediaplayer2/JAudioTrack.cpp

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ JAudioTrack::JAudioTrack( // < Usages of the argumen 
        jBuilderObj = env->CallObjectMethod(jBuilderObj, jSetSessionId, sessionId);

    }



    mFlags = AUDIO_OUTPUT_FLAG_NONE;

    if (cbf != NULL) {

        jmethodID jSetOffloadedPlayback = env->GetMethodID(jBuilderCls, "setOffloadedPlayback",

                "(Z)Landroid/media/AudioTrack$Builder;");

media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ status_t NuPlayer2::Renderer::onGetPlaybackSettings(AudioPlaybackRate *rate /* n 
        status_t err = mAudioSink->getPlaybackRate(rate);

        if (err == OK) {

            if (!isAudioPlaybackRateEqual(*rate, mPlaybackSettings)) {

                ALOGW("correcting mismatch in internal/external playback rate");

                ALOGW("correcting mismatch in internal/external playback rate, %f vs %f",

                      rate->mSpeed, mPlaybackSettings.mSpeed);

            }

            // get playback settings used by audiosink, as it may be

            // slightly off due to audiosink not taking small changes.