commit a13e83c2915e594f29f92033886b8565b91e511f
author Wei Jia <wjia@google.com> Tue Feb 12 21:34:24 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 21:34:24 2019 -0800
tree 43325d2efb737ccd6afba5e9e377b2382b74e5ce
parent 8d7fea64521c9e79e81051d615875e8a4e6af610
parent e9ab588c2cf8698e383b9139ec9f3a15c51f93cd

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

Change-Id: Ieeafefed7f324a68917848e54451693d0bedd019

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index c990b2a..65d6d61 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1161,8 +1161,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).