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

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

Merge "NuPlayerRenderer: avoid divison by zero when sample rate is 0." into mnc-dr-dev

parents 6032b55e 4d7ac854

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -945,6 +945,10 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { 
int64_t NuPlayer::Renderer::getDurationUsIfPlayedAtSampleRate(uint32_t numFrames) {

    int32_t sampleRate = offloadingAudio() ?

            mCurrentOffloadInfo.sample_rate : mCurrentPcmInfo.mSampleRate;

    if (sampleRate == 0) {

        ALOGE("sampleRate is 0 in %s mode", offloadingAudio() ? "offload" : "non-offload");

        return 0;

    }

    // TODO: remove the (int32_t) casting below as it may overflow at 12.4 hours.

    return (int64_t)((int32_t)numFrames * 1000000LL / sampleRate);

}
@@ -1789,6 +1793,7 @@ status_t NuPlayer::Renderer::onOpenAudioSink( 
        }

        if (err != OK) {

            ALOGW("openAudioSink: non offloaded open failed status: %d", err);

            mAudioSink->close();

            mCurrentPcmInfo = AUDIO_PCMINFO_INITIALIZER;

            return err;

        }