commit 7bef0e14010d2527ac4f8abe26e13fe24c918ed1
author Wei Jia <wjia@google.com> Mon Apr 13 15:47:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 13 15:47:17 2015 +0000
tree 1a0554191c300c0b7c7b91684dc85bde26808321
parent d0210ed12d55356c000dca64c2653ed22c586478
parent d9c2e9c81a6f75c4dd6818a3d5075a875d25a2d4

Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on playback rate."

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index a2ec51c..827bdc1 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -312,6 +312,9 @@
                 int64_t delayUs =
                     mAudioSink->msecsPerFrame()
                         * numFramesPendingPlayout * 1000ll;
+                if (mPlaybackRate > 1.0f) {
+                    delayUs /= mPlaybackRate;
+                }
 
                 // Let's give it more data after about half that time
                 // has elapsed.