diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-09-13 11:08:37 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2012-09-13 11:08:37 -0700 |
| commit | 063c1eac60d7cee5d6f1ee61a10f0b6027782357 (patch) | |
| tree | bee6aa994964f31537714cdf3a054107e829158e /services/audioflinger | |
| parent | cd0817e208a5420cf6787e766ec017676cbe4e72 (diff) | |
| download | frameworks_av-063c1eac60d7cee5d6f1ee61a10f0b6027782357.zip frameworks_av-063c1eac60d7cee5d6f1ee61a10f0b6027782357.tar.gz frameworks_av-063c1eac60d7cee5d6f1ee61a10f0b6027782357.tar.bz2 | |
Fix build in AudioFlinger/FastMixer
Commit was missing some changes to modifications to send session ID
from AudioFlinger to AudioMixer.
Change-Id: I7daeaf4eff243b5287bef63be86a87acf408374a
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index dffa099..27e2ed2 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -3498,7 +3498,7 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() readOutputParameters(); mAudioMixer = new AudioMixer(mNormalFrameCount, mSampleRate); for (size_t i = 0; i < mTracks.size() ; i++) { - int name = getTrackName_l(mTracks[i]->mChannelMask); + int name = getTrackName_l(mTracks[i]->mChannelMask, mTracks[i]->mSessionId); if (name < 0) break; mTracks[i]->mName = name; // limit track sample rate to 2 x new output sample rate diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 216e3fa..c956861 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -1202,7 +1202,7 @@ public: protected: virtual mixer_state prepareTracks_l(Vector< sp<Track> > *tracksToRemove); - virtual int getTrackName_l(audio_channel_mask_t channelMask); + virtual int getTrackName_l(audio_channel_mask_t channelMask, int sessionId); virtual void deleteTrackName_l(int name); virtual uint32_t idleSleepTimeUs() const; virtual uint32_t suspendSleepTimeUs() const; diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index cdc27a2..13003d9 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -281,8 +281,9 @@ bool FastMixer::threadLoop() AudioBufferProvider *bufferProvider = fastTrack->mBufferProvider; ALOG_ASSERT(bufferProvider != NULL && fastTrackNames[i] == -1); if (mixer != NULL) { - // calling getTrackName with default channel mask - name = mixer->getTrackName(AUDIO_CHANNEL_OUT_STEREO); + // calling getTrackName with default channel mask and a random invalid + // sessionId (no effects here) + name = mixer->getTrackName(AUDIO_CHANNEL_OUT_STEREO, -555); ALOG_ASSERT(name >= 0); fastTrackNames[i] = name; mixer->setBufferProvider(name, bufferProvider); |