summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-03-06 10:52:18 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-06 10:52:18 -0800
commit54682583ba809a315ac1e5437d7f74483e6c7ab8 (patch)
tree46a324f12041ca796ebbb81faac08a69da7d2967 /include
parent4f03d35f9c040222e6a46dde807fe2ff7852beb8 (diff)
parentbd6b74ce4626c6738bec3d59f7cca95655d1288f (diff)
downloadframeworks_base-54682583ba809a315ac1e5437d7f74483e6c7ab8.zip
frameworks_base-54682583ba809a315ac1e5437d7f74483e6c7ab8.tar.gz
frameworks_base-54682583ba809a315ac1e5437d7f74483e6c7ab8.tar.bz2
Merge "AudioTrack: relax check on minimum buffer size"
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 9f2bd3a..95b9d86 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -135,8 +135,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.