diff options
| author | Andy Hung <hunga@google.com> | 2014-05-20 01:04:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 01:04:48 +0000 |
| commit | 00ddac6f47a066a545342a81c40425e3a153e8a1 (patch) | |
| tree | c9d3c9e845b5467c55fe05e0936f7af3956b7d3a /services/audioflinger/FastMixer.cpp | |
| parent | ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3 (diff) | |
| parent | 68112fc4f77ab8c4a744782f78e9792afe0cbfc1 (diff) | |
| download | frameworks_av-00ddac6f47a066a545342a81c40425e3a153e8a1.zip frameworks_av-00ddac6f47a066a545342a81c40425e3a153e8a1.tar.gz frameworks_av-00ddac6f47a066a545342a81c40425e3a153e8a1.tar.bz2 | |
Merge "Update AudioMixer::getTrackName to save channelMask"
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 42ba791..1caed11 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -224,17 +224,13 @@ void FastMixer::onStateChange() AudioBufferProvider *bufferProvider = fastTrack->mBufferProvider; ALOG_ASSERT(bufferProvider != NULL && fastTrackNames[i] == -1); if (mixer != NULL) { - // calling getTrackName with default channel mask and a random invalid - // sessionId (no effects here) - name = mixer->getTrackName(AUDIO_CHANNEL_OUT_STEREO, -555); + name = mixer->getTrackName(fastTrack->mChannelMask, AUDIO_SESSION_OUTPUT_MIX); ALOG_ASSERT(name >= 0); fastTrackNames[i] = name; mixer->setBufferProvider(name, bufferProvider); mixer->setParameter(name, AudioMixer::TRACK, AudioMixer::MAIN_BUFFER, (void *) mixBuffer); // newly allocated track names default to full scale volume - mixer->setParameter(name, AudioMixer::TRACK, AudioMixer::CHANNEL_MASK, - (void *)(uintptr_t)fastTrack->mChannelMask); mixer->enable(name); } generations[i] = fastTrack->mGeneration; |