commit 23a9678be176a514ee8b626f5fb5062a958b2776
author Wei Jia <wjia@google.com> Tue Feb 12 20:57:04 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 20:57:04 2019 -0800
tree 4e5d813778e29c597fab81c3ea1103f37fb8e3c5
parent 716f64f54cfef823e8b996427d4c52c9348db5cb
parent 615d9ff50e81846a33dceace331650ddb2cae9ea

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

Change-Id: I948a0626bb9c3ca0c65eed3ba38cb905e285c7ca

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).