diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-12-14 16:56:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-14 16:56:31 -0800 |
| commit | 2eda60a8485cfe70a60e72156beffdc470ecb093 (patch) | |
| tree | bd491ab0f798c707b6bade7051f0d9e0cba23337 /services/audioflinger | |
| parent | f7d4ae9149a1fa4fa97ee0ba97652e28ed92b297 (diff) | |
| parent | 362c4e697d8e9c034e964ac7b40227e054491547 (diff) | |
| download | frameworks_av-2eda60a8485cfe70a60e72156beffdc470ecb093.zip frameworks_av-2eda60a8485cfe70a60e72156beffdc470ecb093.tar.gz frameworks_av-2eda60a8485cfe70a60e72156beffdc470ecb093.tar.bz2 | |
Merge "Audio C++ comments"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 2b4e415..4f8ef4b 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1000,7 +1000,7 @@ AudioFlinger::ThreadBase::~ThreadBase() void AudioFlinger::ThreadBase::exit() { - // keep a strong ref on ourself so that we wont get + // keep a strong ref on ourself so that we won't get // destroyed in the middle of requestExitAndWait() sp <ThreadBase> strongMe = this; @@ -2345,7 +2345,7 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() } if (param.getInt(String8(AudioParameter::keyFrameCount), value) == NO_ERROR) { // do not accept frame count changes if tracks are open as the track buffer - // size depends on frame count and correct behavior would not be garantied + // size depends on frame count and correct behavior would not be guaranteed // if frame count is changed after track creation if (!mTracks.isEmpty()) { status = INVALID_OPERATION; diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 75c9170..da9e2b5 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -65,10 +65,10 @@ public: FORMAT = 0x4001, MAIN_BUFFER = 0x4002, AUX_BUFFER = 0x4003, - // for TARGET RESAMPLE + // for target RESAMPLE SAMPLE_RATE = 0x4100, RESET = 0x4101, - // for TARGET VOLUME (8 channels max) + // for target RAMP_VOLUME and VOLUME (8 channels max) VOLUME0 = 0x4200, VOLUME1 = 0x4201, AUXLEVEL = 0x4210, |