summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-04-13 15:47:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-13 15:47:17 +0000
commit7bef0e14010d2527ac4f8abe26e13fe24c918ed1 (patch)
tree1a0554191c300c0b7c7b91684dc85bde26808321 /media
parentd0210ed12d55356c000dca64c2653ed22c586478 (diff)
parentd9c2e9c81a6f75c4dd6818a3d5075a875d25a2d4 (diff)
downloadframeworks_av-7bef0e14010d2527ac4f8abe26e13fe24c918ed1.zip
frameworks_av-7bef0e14010d2527ac4f8abe26e13fe24c918ed1.tar.gz
frameworks_av-7bef0e14010d2527ac4f8abe26e13fe24c918ed1.tar.bz2
Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on playback rate."
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp3
1 files changed, 3 insertions, 0 deletions
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 @@ void NuPlayer::Renderer::onMessageReceived(const sp<AMessage> &msg) {
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.