diff options
author | Glenn Kasten <gkasten@google.com> | 2013-10-30 14:37:29 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-11-06 14:49:46 -0800 |
commit | d6fadf0479b489b09b764070974d8a59855ede64 (patch) | |
tree | 239aa64bd7cdc0e69b1ad8e1ef85be7e09176a56 /services/audioflinger/AudioMixer.h | |
parent | 8f32537d028231abed103c68705bc5d07cedf919 (diff) | |
download | frameworks_av-d6fadf0479b489b09b764070974d8a59855ede64.zip frameworks_av-d6fadf0479b489b09b764070974d8a59855ede64.tar.gz frameworks_av-d6fadf0479b489b09b764070974d8a59855ede64.tar.bz2 |
Simplify track 'needs' bits
Use more standard coding convention for bit masks,
and add a FIXME about max channel count.
Change-Id: I856784016703417ee480b92ae73757c472f9cf95
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r-- | services/audioflinger/AudioMixer.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index a15bdca..d5c9da7 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -120,27 +120,19 @@ public: private: enum { + // FIXME this representation permits up to 8 channels NEEDS_CHANNEL_COUNT__MASK = 0x00000007, - NEEDS_FORMAT__MASK = 0x000000F0, - NEEDS_MUTE__MASK = 0x00000100, - NEEDS_RESAMPLE__MASK = 0x00001000, - NEEDS_AUX__MASK = 0x00010000, }; enum { - NEEDS_CHANNEL_1 = 0x00000000, - NEEDS_CHANNEL_2 = 0x00000001, + NEEDS_CHANNEL_1 = 0x00000000, // mono + NEEDS_CHANNEL_2 = 0x00000001, // stereo - NEEDS_FORMAT_16 = 0x00000010, + // sample format is not explicitly specified, and is assumed to be AUDIO_FORMAT_PCM_16_BIT - NEEDS_MUTE_DISABLED = 0x00000000, - NEEDS_MUTE_ENABLED = 0x00000100, - - NEEDS_RESAMPLE_DISABLED = 0x00000000, - NEEDS_RESAMPLE_ENABLED = 0x00001000, - - NEEDS_AUX_DISABLED = 0x00000000, - NEEDS_AUX_ENABLED = 0x00010000, + NEEDS_MUTE = 0x00000100, + NEEDS_RESAMPLE = 0x00001000, + NEEDS_AUX = 0x00010000, }; struct state_t; |