Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use constants for 2 and 32

Browse Source 
Change-Id: If820dfd58b6df258570750610a07af99598d9e53
This commit is contained in:
Glenn Kasten
2011-12-13 11:52:35 -08:00
parent 586995afe6
commit 1f6f05da93
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/audioflinger/AudioMixer.cpp
View File

@@ -57,7 +57,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate)
mState.resampleTemp = NULL;
mState.hook = process__nop;
track_t* t = mState.tracks;
for (int i=0 ; i<32 ; i++) {
for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) {
t->needs = 0;
t->volume[0] = UNITY_GAIN;
t->volume[1] = UNITY_GAIN;
@@ -90,7 +90,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate)
AudioMixer::~AudioMixer()
{
track_t* t = mState.tracks;
for (int i=0 ; i<32 ; i++) {
for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) {
delete t->resampler;
t++;
}
@@ -319,7 +319,7 @@ void AudioMixer::track_t::resetResampler()
inline
void AudioMixer::track_t::adjustVolumeRamp(bool aux)
{
for (int i=0 ; i<2 ; i++) {
for (int i=0 ; i<MAX_NUM_CHANNELS ; i++) {
if (((volumeInc[i]>0) && (((prevVolume[i]+volumeInc[i])>>16) >= volume[i])) ||
((volumeInc[i]<0) && (((prevVolume[i]+volumeInc[i])>>16) <= volume[i]))) {
volumeInc[i] = 0;

10
services/audioflinger/AudioMixer.h
View File

@@ -47,7 +47,7 @@ public:
enum { // names
// track units (32 units)
// track units (MAX_NUM_TRACKS units)
TRACK0 = 0x1000,
// 0x2000 is unused
@@ -132,13 +132,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;
@@ -177,7 +177,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;