commit 57216ca41b2d7e35bda01ce910ae6e72ed01bfae
author Glenn Kasten <gkasten@google.com> Fri Dec 05 21:00:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 05 21:00:04 2014 +0000
tree ea084b4e5befb3ba62cb18234279df7fd3fcb73f
parent 597ce69a77636eab073fc83ded01e8af51e887e2
parent be837c328ae1ea2b193d05aaa3d4214c263b5b77

Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 4a6df6d..e4c3c08 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1226,7 +1226,11 @@
         mStaticProxy = new StaticAudioTrackClientProxy(cblk, buffers, frameCount, mFrameSizeAF);
         mProxy = mStaticProxy;
     }
-    mProxy->setVolumeLR(GAIN_MINIFLOAT_PACKED_UNITY);
+
+    mProxy->setVolumeLR(gain_minifloat_pack(
+            gain_from_float(mVolume[AUDIO_INTERLEAVE_LEFT]),
+            gain_from_float(mVolume[AUDIO_INTERLEAVE_RIGHT])));
+
     mProxy->setSendLevel(mSendLevel);
     mProxy->setSampleRate(mSampleRate);
     mProxy->setMinimum(mNotificationFramesAct);