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

Added audio_bytes_per_sample() helper function

Browse Source 
Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
This commit is contained in:
Eric Laurent
2011-06-16 21:30:45 -07:00
parent b86b030acd
commit c310dcbed6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmedia/AudioRecord.cpp
View File

@@ -70,7 +70,7 @@ status_t AudioRecord::getMinFrameCount(
size <<= 1; size <<= 1;
if (audio_is_linear_pcm(format)) { if (audio_is_linear_pcm(format)) {
size /= channelCount * (format == AUDIO_FORMAT_PCM_16_BIT ? 2 : 1); size /= channelCount * audio_bytes_per_sample(format);
} }
*frameCount = size; *frameCount = size;
@@ -258,7 +258,7 @@ uint32_t AudioRecord::frameCount() const
int AudioRecord::frameSize() const int AudioRecord::frameSize() const
{ {
if (audio_is_linear_pcm(mFormat)) { if (audio_is_linear_pcm(mFormat)) {
return channelCount()*((format() == AUDIO_FORMAT_PCM_8_BIT) ? sizeof(uint8_t) : sizeof(int16_t)); return channelCount()*audio_bytes_per_sample(mFormat);
} else { } else {
return sizeof(uint8_t); return sizeof(uint8_t);
} }

2
media/libmedia/AudioTrack.cpp
View File

@@ -298,7 +298,7 @@ uint32_t AudioTrack::frameCount() const
int AudioTrack::frameSize() const int AudioTrack::frameSize() const
{ {
if (audio_is_linear_pcm(mFormat)) { if (audio_is_linear_pcm(mFormat)) {
return channelCount()*((format() == AUDIO_FORMAT_PCM_8_BIT) ? sizeof(uint8_t) : sizeof(int16_t)); return channelCount()*audio_bytes_per_sample(mFormat);
} else { } else {
return sizeof(uint8_t); return sizeof(uint8_t);
} }

2
services/audioflinger/AudioFlinger.cpp
View File

@@ -2936,7 +2936,7 @@ AudioFlinger::PlaybackThread::Track::Track(
mStreamType = streamType; mStreamType = streamType;
// NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of
// 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack
mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(int8_t); mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * audio_bytes_per_sample(format) : sizeof(uint8_t);
} }
} }