summaryrefslogtreecommitdiffstats
path: root/include/media/AudioSystem.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-07-02 12:42:44 -0700
committerGlenn Kasten <gkasten@google.com>2012-07-03 10:24:45 -0700
commitdd8104cc5367262f0e5f13df4e79f131e8d560bb (patch)
tree46c95f24576ec352d7d5d363606db9a46a44e9c3 /include/media/AudioSystem.h
parentf1da96d8cf60842538e00a9c950cc451f7da2c10 (diff)
downloadframeworks_av-dd8104cc5367262f0e5f13df4e79f131e8d560bb.zip
frameworks_av-dd8104cc5367262f0e5f13df4e79f131e8d560bb.tar.gz
frameworks_av-dd8104cc5367262f0e5f13df4e79f131e8d560bb.tar.bz2
Use audio_channel_mask_t more consistently
In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(), declare input parameter to use correct type audio_channel_mask_t. In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask instead of channel count. Remove unused IAudioFlinger::channelCount(audio_io_handle_t). In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(), input parameter is channel mask instead of channel count. Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
Diffstat (limited to 'include/media/AudioSystem.h')
-rw-r--r--include/media/AudioSystem.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index 0662244..18c9c92 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -110,8 +110,8 @@ public:
static bool routedToA2dpOutput(audio_stream_type_t streamType);
- static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount,
- size_t* buffSize);
+ static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format,
+ audio_channel_mask_t channelMask, size_t* buffSize);
static status_t setVoiceVolume(float volume);
@@ -276,7 +276,7 @@ private:
// previous parameters for recording buffer size queries
static uint32_t gPrevInSamplingRate;
static audio_format_t gPrevInFormat;
- static int gPrevInChannelCount;
+ static audio_channel_mask_t gPrevInChannelMask;
static sp<IAudioPolicyService> gAudioPolicyService;