summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-03-04 22:16:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-04 22:16:34 +0000
commit1a86a8adbf4ab43a6aed2c3c8aa0830c001adb77 (patch)
tree46cbb6b12a1dbc0036a2f1639ea47d53e428be62 /media
parent74b19286cfeb952adf4711ef4a3e18a1ea9ff03f (diff)
parentc8206ffa7d2361dd89c09166ff85ca6396babe28 (diff)
downloadframeworks_av-1a86a8adbf4ab43a6aed2c3c8aa0830c001adb77.zip
frameworks_av-1a86a8adbf4ab43a6aed2c3c8aa0830c001adb77.tar.gz
frameworks_av-1a86a8adbf4ab43a6aed2c3c8aa0830c001adb77.tar.bz2
Merge "mediaplayer: call setPlaybackRate after Renderer has looper set up."
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0d19fe9..1e88bfa 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1065,14 +1065,13 @@ void NuPlayer::onStart() {
++mRendererGeneration;
notify->setInt32("generation", mRendererGeneration);
mRenderer = new Renderer(mAudioSink, notify, flags);
- if (mPlaybackRate != 1.0) {
- mRenderer->setPlaybackRate(mPlaybackRate);
- }
-
mRendererLooper = new ALooper;
mRendererLooper->setName("NuPlayerRenderer");
mRendererLooper->start(false, false, ANDROID_PRIORITY_AUDIO);
mRendererLooper->registerHandler(mRenderer);
+ if (mPlaybackRate != 1.0) {
+ mRenderer->setPlaybackRate(mPlaybackRate);
+ }
sp<MetaData> meta = getFileMeta();
int32_t rate;