Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1

Browse Source 
* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
  AudioTrack: relax check on minimum buffer size
This commit is contained in:
Eric Laurent
2012-03-16 15:01:01 -07:00
committed by Android Git Automerger
parent 31f7ef2436 3fe7ee651d
commit 393dd03eaf
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/media/AudioTrack.h
View File

@@ -130,8 +130,10 @@ public:
* format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed * format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed
* 16 bits per sample). * 16 bits per sample).
* channelMask: Channel mask: see audio_channels_t. * channelMask: Channel mask: see audio_channels_t.
* frameCount: Total size of track PCM buffer in frames. This defines the * frameCount: Minimum size of track PCM buffer in frames. This defines the
* latency of the track. * 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. * flags: Reserved for future use.
* cbf: Callback function. If not null, this function is called periodically * cbf: Callback function. If not null, this function is called periodically
* to request new PCM data. * to request new PCM data.

9
media/libmedia/AudioTrack.cpp
View File

@@ -763,12 +763,9 @@ status_t AudioTrack::createTrack_l(
mNotificationFramesAct = frameCount/2; mNotificationFramesAct = frameCount/2;
} }
if (frameCount < minFrameCount) { if (frameCount < minFrameCount) {
if (enforceFrameCount) { LOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",
LOGE("Invalid buffer size: minFrameCount %d, frameCount %d", minFrameCount, frameCount); frameCount, minFrameCount);
return BAD_VALUE; frameCount = minFrameCount;
} else {
frameCount = minFrameCount;
}
} }
} else { } else {
// Ensure that buffer alignment matches channelcount // Ensure that buffer alignment matches channelcount