diff options
author | Glenn Kasten <gkasten@google.com> | 2013-02-27 09:05:28 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-03-01 15:36:26 -0800 |
commit | ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0 (patch) | |
tree | 9eda6276ab70724dcc98e56f7ca16afeb70ff079 /services/audioflinger/AudioMixer.cpp | |
parent | 3605ab3c02516e4123c39062de301bacc8ea8d9f (diff) | |
download | frameworks_av-ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0.zip frameworks_av-ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0.tar.gz frameworks_av-ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0.tar.bz2 |
media.log cleanup
Remove almost all of the specific logs, but leave the media.log
logging infrastructure in place for the next time we need it.
Re-apply a few good changes that were reverted earlier:
- check logf format vs. argument list compatibility
- distinguish potentially modified and actually modified tracks in FastMixer
- fix benign bug where sq->end() was called more than once
- fix a build warning
Bug: 6490974
Change-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 17b6a8a..7d38f80 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -122,6 +122,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate, uint32_t maxNumTr mState.hook = process__nop; mState.outputTemp = NULL; mState.resampleTemp = NULL; + mState.mLog = &mDummyLog; // mState.reserved // FIXME Most of the following initialization is probably redundant since @@ -169,6 +170,11 @@ AudioMixer::~AudioMixer() delete [] mState.resampleTemp; } +void AudioMixer::setLog(NBLog::Writer *log) +{ + mState.mLog = log; +} + int AudioMixer::getTrackName(audio_channel_mask_t channelMask, int sessionId) { uint32_t names = (~mTrackNames) & mConfiguredNames; @@ -620,7 +626,6 @@ void AudioMixer::setBufferProvider(int name, AudioBufferProvider* bufferProvider } - void AudioMixer::process(int64_t pts) { mState.hook(&mState, pts); |