diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-12-16 15:10:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-16 15:10:36 -0800 |
| commit | f602a5f7f29e694a7da4c143737b74501c00477d (patch) | |
| tree | c7edef89cc88918b8cb04168253664470de77036 /services/audioflinger/AudioMixer.h | |
| parent | d1e672acd8fa1af899f85ee2321327237028adf8 (diff) | |
| parent | bf71f1e7948406492376c6cbd5e6a30c8cb670e4 (diff) | |
| download | frameworks_av-f602a5f7f29e694a7da4c143737b74501c00477d.zip frameworks_av-f602a5f7f29e694a7da4c143737b74501c00477d.tar.gz frameworks_av-f602a5f7f29e694a7da4c143737b74501c00477d.tar.bz2 | |
Merge "Use constants for 2 and 32"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index c4a7871..39af103 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -47,7 +47,7 @@ public: enum { // names - // track units (32 units) + // track units (MAX_NUM_TRACKS units) TRACK0 = 0x1000, // 0x2000 is unused @@ -130,13 +130,13 @@ private: uint32_t needs; union { - int16_t volume[2]; // [0]3.12 fixed point + int16_t volume[MAX_NUM_CHANNELS]; // [0]3.12 fixed point int32_t volumeRL; }; - int32_t prevVolume[2]; + int32_t prevVolume[MAX_NUM_CHANNELS]; - int32_t volumeInc[2]; + int32_t volumeInc[MAX_NUM_CHANNELS]; int32_t auxLevel; int32_t auxInc; int32_t prevAuxLevel; @@ -175,7 +175,7 @@ private: int32_t *outputTemp; int32_t *resampleTemp; int32_t reserved[2]; - track_t tracks[32]; __attribute__((aligned(32))); + track_t tracks[MAX_NUM_TRACKS]; __attribute__((aligned(32))); }; int mActiveTrack; |