diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-08 19:02:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-08 19:02:25 +0000 |
| commit | 96b292fd3c76f9af155ee6f7a8559258eeedc6fd (patch) | |
| tree | a52e3ff228517b1a9b0a712e9d73ce9358cb0ad3 /include | |
| parent | 11cd9a68c3136ad5e5a5ea3bfd439fce3ce29b20 (diff) | |
| parent | b773038277ba328696832b690b91ce6e95bd1a6c (diff) | |
| download | frameworks_av-96b292fd3c76f9af155ee6f7a8559258eeedc6fd.zip frameworks_av-96b292fd3c76f9af155ee6f7a8559258eeedc6fd.tar.gz frameworks_av-96b292fd3c76f9af155ee6f7a8559258eeedc6fd.tar.bz2 | |
Merge "Add client side support for more AUDIO_FORMAT_PCM_*"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 2c48bbf..79db323 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -154,8 +154,9 @@ public: * streamType: Select the type of audio stream this track is attached to * (e.g. AUDIO_STREAM_MUSIC). * sampleRate: Data source sampling rate in Hz. - * format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed - * 16 bits per sample). + * format: Audio format. For mixed tracks, any PCM format supported by server is OK + * or AUDIO_FORMAT_PCM_8_BIT which is handled on client side. For direct + * and offloaded tracks, the possible format(s) depends on the output sink. * channelMask: Channel mask, such that audio_is_output_channel(channelMask) is true. * frameCount: Minimum size of track PCM buffer in frames. This defines the * application's contribution to the |