commit e9ab588c2cf8698e383b9139ec9f3a15c51f93cd
author Wei Jia <wjia@google.com> Tue Feb 12 21:06:21 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 21:06:21 2019 -0800
tree 7d3bfc555c86fac12122b4362a27e9116a2eb9e6
parent e0aad0c92795f012e061b7a428ef66cd009d2642
parent 23a9678be176a514ee8b626f5fb5062a958b2776

Merge "Fix bugs regarding clamping of numFrames variable." am: 615d9ff50e
am: 23a9678be1

Change-Id: I47258ce06c86cdce5674beae4433b3f4288fbb8c

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index be116e3..4992137 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1145,8 +1145,8 @@
         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).