diff options
| author | Eric Laurent <elaurent@google.com> | 2013-09-14 00:07:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 00:07:29 +0000 |
| commit | 7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0 (patch) | |
| tree | d780b615c9e2ea42c5449ebfeb870b3c7bee7eb9 /services/audioflinger | |
| parent | d4dadf23dd2dd8acd514d60d84475954070340b8 (diff) | |
| parent | 1abbdb4429479975718421c4fef3f79ce7c820e3 (diff) | |
| download | frameworks_av-7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0.zip frameworks_av-7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0.tar.gz frameworks_av-7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0.tar.bz2 | |
Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 885f72e..4234965 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3510,7 +3510,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep if (track->mFillingUpStatus == Track::FS_FILLED) { track->mFillingUpStatus = Track::FS_ACTIVE; - mLeftVolFloat = mRightVolFloat = 0; + // make sure processVolume_l() will apply new volume even if 0 + mLeftVolFloat = mRightVolFloat = -1.0; if (track->mState == TrackBase::RESUMING) { track->mState = TrackBase::ACTIVE; } @@ -3895,7 +3896,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->mServer); if (track->mFillingUpStatus == Track::FS_FILLED) { track->mFillingUpStatus = Track::FS_ACTIVE; - mLeftVolFloat = mRightVolFloat = 0; + // make sure processVolume_l() will apply new volume even if 0 + mLeftVolFloat = mRightVolFloat = -1.0; if (track->mState == TrackBase::RESUMING) { if (mPausedBytesRemaining) { // Need to continue write that was interrupted |