diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-16 20:42:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-16 20:42:24 +0000 |
| commit | 74bebe401dd966308f29b0c4f42cf6946dc64582 (patch) | |
| tree | cc6666875298f58e252864f303c1736eea44f4e3 /services | |
| parent | 8952c68ecea34cd58245577636b51a5124706893 (diff) | |
| parent | f59497bd3c190e087202043de5450ef06e92b27d (diff) | |
| download | frameworks_av-74bebe401dd966308f29b0c4f42cf6946dc64582.zip frameworks_av-74bebe401dd966308f29b0c4f42cf6946dc64582.tar.gz frameworks_av-74bebe401dd966308f29b0c4f42cf6946dc64582.tar.bz2 | |
Merge "Update comments"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 1 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index e070f90..f1cf0aa 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -415,6 +415,7 @@ void FastMixer::onWork() memset(mMixerBuffer, 0, mMixerBufferSize); mMixerBufferState = ZEROED; } + // prepare the buffer used to write to sink void *buffer = mSinkBuffer != NULL ? mSinkBuffer : mMixerBuffer; if (mFormat.mFormat != mMixerBufferFormat) { // sink format not the same as mixer format memcpy_by_audio_format(buffer, mFormat.mFormat, mMixerBuffer, mMixerBufferFormat, diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 9350e48..d600ea9 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -427,7 +427,7 @@ protected: bool mStandby; // Whether thread is currently in standby. audio_devices_t mOutDevice; // output device audio_devices_t mInDevice; // input device - audio_source_t mAudioSource; // (see audio.h, audio_source_t) + audio_source_t mAudioSource; const audio_io_handle_t mId; Vector< sp<EffectChain> > mEffectChains; |