commit e0aad0c92795f012e061b7a428ef66cd009d2642
author Wei Jia <wjia@google.com> Tue Feb 12 21:04:08 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 21:04:08 2019 -0800
tree 8b4293f5d25c3fc98802db7c11a2e31ab62071ac
parent 752403d7b33cb3242316037cbd3c1e1a4951ffd8
parent 716f64f54cfef823e8b996427d4c52c9348db5cb

Merge "Fix bugs regarding clamping of numFrames variable." am: f4935e88d1
am: 716f64f54c

Change-Id: Id52b35a1b5d4fb4f803172f57cabf6487242be85

media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp

diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp
index fcc7fa5..3d69188 100644
--- a/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp
@@ -1156,8 +1156,7 @@
         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).