diff options
| author | Andy Hung <hunga@google.com> | 2014-05-23 23:51:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 23:51:17 +0000 |
| commit | c62476f0c0c1cf9283a38852bde0a4c9434df712 (patch) | |
| tree | 6249b263dba1e91017e9debfe4c2e8f79b1be2c7 /services/audioflinger/FastMixer.cpp | |
| parent | 7a470c375c2cef8b186fbadd9915b30e5d757453 (diff) | |
| parent | e8a1ced4da17dc6c07803dc2af8060f62a8389c1 (diff) | |
| download | frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.zip frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.gz frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.bz2 | |
Merge "Add format parameter to getTrackName() and track_t"
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 130a7e7..7e15bef 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -223,7 +223,8 @@ void FastMixer::onStateChange() AudioBufferProvider *bufferProvider = fastTrack->mBufferProvider; ALOG_ASSERT(bufferProvider != NULL && fastTrackNames[i] == -1); if (mixer != NULL) { - name = mixer->getTrackName(fastTrack->mChannelMask, AUDIO_SESSION_OUTPUT_MIX); + name = mixer->getTrackName(fastTrack->mChannelMask, + fastTrack->mFormat, AUDIO_SESSION_OUTPUT_MIX); ALOG_ASSERT(name >= 0); fastTrackNames[i] = name; mixer->setBufferProvider(name, bufferProvider); |