diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-16 17:19:25 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-03-16 17:19:25 -0700 |
| commit | b388138ff2986d6883fa9331fa91ae5e18ae81a0 (patch) | |
| tree | 7120b73c65527dd77bd2c39980b8432fd97604f5 /include | |
| parent | 5fd6deb0497d6763514f125b5fde69ee4efdc3c2 (diff) | |
| parent | 3fe7ee651db0aae9485ead227c89db1e24b9e245 (diff) | |
| download | frameworks_base-b388138ff2986d6883fa9331fa91ae5e18ae81a0.zip frameworks_base-b388138ff2986d6883fa9331fa91ae5e18ae81a0.tar.gz frameworks_base-b388138ff2986d6883fa9331fa91ae5e18ae81a0.tar.bz2 | |
resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index d1a8105..1c401e2 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -130,8 +130,10 @@ public: * format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed * 16 bits per sample). * channelMask: Channel mask: see audio_channels_t. - * frameCount: Total size of track PCM buffer in frames. This defines the - * latency of the track. + * 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 + * latency. * flags: Reserved for future use. * cbf: Callback function. If not null, this function is called periodically * to request new PCM data. |