diff options
author | Glenn Kasten <gkasten@google.com> | 2012-07-03 17:24:41 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-07-17 11:31:59 -0700 |
commit | 28b76b334f92a15a2be3cc9e2f7d229a3275d1ac (patch) | |
tree | c605d3e995f4b6be55dd4b10e1c998b059990d0d /include/media/AudioTrack.h | |
parent | fd4e20c226eca185fc789de761beae64855bfbbb (diff) | |
download | frameworks_av-28b76b334f92a15a2be3cc9e2f7d229a3275d1ac.zip frameworks_av-28b76b334f92a15a2be3cc9e2f7d229a3275d1ac.tar.gz frameworks_av-28b76b334f92a15a2be3cc9e2f7d229a3275d1ac.tar.bz2 |
Use audio_channel_mask_t for channel mask
Change-Id: I1c1896da48983aa9f1462a4b471f910498816f60
Diffstat (limited to 'include/media/AudioTrack.h')
-rw-r--r-- | include/media/AudioTrack.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 325f780..26a25b0 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -135,7 +135,7 @@ public: * sampleRate: Track sampling rate in Hz. * format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed * 16 bits per sample). - * channelMask: Channel mask: see audio_channels_t. + * channelMask: Channel mask. * frameCount: Minimum size of track PCM buffer in frames. This defines the * latency of the track. The actual size selected by the AudioTrack could be * larger if the requested size is not compatible with current audio HAL @@ -154,7 +154,7 @@ public: AudioTrack( audio_stream_type_t streamType, uint32_t sampleRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, - int channelMask = 0, + audio_channel_mask_t channelMask = 0, int frameCount = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, @@ -186,7 +186,7 @@ public: AudioTrack( audio_stream_type_t streamType, uint32_t sampleRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, - int channelMask = 0, + audio_channel_mask_t channelMask = 0, const sp<IMemory>& sharedBuffer = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, @@ -204,13 +204,13 @@ public: * Returned status (from utils/Errors.h) can be: * - NO_ERROR: successful initialization * - INVALID_OPERATION: AudioTrack is already initialized - * - BAD_VALUE: invalid parameter (channels, format, sampleRate...) + * - BAD_VALUE: invalid parameter (channelMask, format, sampleRate...) * - NO_INIT: audio server or audio hardware not initialized * */ status_t set(audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT, uint32_t sampleRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, - int channelMask = 0, + audio_channel_mask_t channelMask = 0, int frameCount = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, @@ -485,7 +485,7 @@ protected: status_t createTrack_l(audio_stream_type_t streamType, uint32_t sampleRate, audio_format_t format, - uint32_t channelMask, + audio_channel_mask_t channelMask, int frameCount, audio_output_flags_t flags, const sp<IMemory>& sharedBuffer, @@ -510,7 +510,7 @@ protected: uint8_t mChannelCount; uint8_t mMuted; uint8_t mReserved; - uint32_t mChannelMask; + audio_channel_mask_t mChannelMask; status_t mStatus; uint32_t mLatency; |