diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-07-02 12:42:44 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-03 10:24:45 -0700 |
| commit | dd8104cc5367262f0e5f13df4e79f131e8d560bb (patch) | |
| tree | 46c95f24576ec352d7d5d363606db9a46a44e9c3 /include | |
| parent | f1da96d8cf60842538e00a9c950cc451f7da2c10 (diff) | |
| download | frameworks_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')
| -rw-r--r-- | include/media/AudioRecord.h | 2 | ||||
| -rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 56be107..813ea85 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -107,7 +107,7 @@ public: static status_t getMinFrameCount(int* frameCount, uint32_t sampleRate, audio_format_t format, - int channelCount); + audio_channel_mask_t channelMask); /* Constructs an uninitialized AudioRecord. No connection with * AudioFlinger takes place. 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; diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 86e228b..5d95b3b 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -60,7 +60,7 @@ public: audio_stream_type_t streamType, uint32_t sampleRate, audio_format_t format, - uint32_t channelMask, + audio_channel_mask_t channelMask, int frameCount, track_flags_t flags, const sp<IMemory>& sharedBuffer, @@ -74,7 +74,7 @@ public: audio_io_handle_t input, uint32_t sampleRate, audio_format_t format, - uint32_t channelMask, + audio_channel_mask_t channelMask, int frameCount, track_flags_t flags, int *sessionId, @@ -84,7 +84,9 @@ public: * and therefore can be cached. */ virtual uint32_t sampleRate(audio_io_handle_t output) const = 0; +#if 0 virtual int channelCount(audio_io_handle_t output) const = 0; +#endif virtual audio_format_t format(audio_io_handle_t output) const = 0; virtual size_t frameCount(audio_io_handle_t output) const = 0; @@ -126,7 +128,8 @@ public: virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0; // retrieve the audio recording buffer size - virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const = 0; + virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, + audio_channel_mask_t channelMask) const = 0; virtual audio_io_handle_t openOutput(audio_module_handle_t module, audio_devices_t *pDevices, |