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

Commit 716f64f5 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "Fix bugs regarding clamping of numFrames variable." 

am: f4935e88

Change-Id: Ibac7f239c1c60deae4b17e2ce5d422576c6112a8
parents e08a1f04 f4935e88

media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1156,8 +1156,7 @@ int64_t NuPlayer2::Renderer::getDurationUsIfPlayedAtSampleRate(uint32_t numFrame 
        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);

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

}



// Calculate duration of pending samples if played at normal rate (i.e., 1.0).