diff options
| author | Andy Hung <hunga@google.com> | 2014-05-09 15:02:21 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-05-19 12:27:46 -0700 |
| commit | e8a1ced4da17dc6c07803dc2af8060f62a8389c1 (patch) | |
| tree | eadb47a0d9349451773ef55adaa60317e1dbafad /services/audioflinger/FastMixer.cpp | |
| parent | 68112fc4f77ab8c4a744782f78e9792afe0cbfc1 (diff) | |
| download | frameworks_av-e8a1ced4da17dc6c07803dc2af8060f62a8389c1.zip frameworks_av-e8a1ced4da17dc6c07803dc2af8060f62a8389c1.tar.gz frameworks_av-e8a1ced4da17dc6c07803dc2af8060f62a8389c1.tar.bz2 | |
Add format parameter to getTrackName() and track_t
Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e
Signed-off-by: Andy Hung <hunga@google.com>
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 b909904..9e9f20d 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -224,7 +224,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); |