summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-06-21 12:56:37 -0700
committerGlenn Kasten <gkasten@google.com>2012-11-14 16:45:53 -0800
commit520a9af9438c29b24e328dd2b7a287c7a96a4e6b (patch)
tree48d6cbcf8f8bd84e05c00855e0ede8d03e14e04c /include
parent1127d65d536ebbe447ee17ce0926a7ce4a2a3c08 (diff)
downloadframeworks_av-520a9af9438c29b24e328dd2b7a287c7a96a4e6b.zip
frameworks_av-520a9af9438c29b24e328dd2b7a287c7a96a4e6b.tar.gz
frameworks_av-520a9af9438c29b24e328dd2b7a287c7a96a4e6b.tar.bz2
Clean up frame size in AudioTrack and AudioFlinger
TrackBase::mFrameSize, mChannelMask, and mChannelCount are now const. Use TrackBase::mFrameSize instead of re-calculating frame size. AudioFlinger only sees 16-bit PCM format, conversion from 8-bit is now entirely on the client side. Previously a small part of the responsibility was on server side also. size_t is unsigned, so use %u in logs. Fix theoretical bug where TrackBase constructor was over-allocating space for non-linear AudioTrack or 8-bit PCM AudioRecord (probably benign). Change-Id: I7cbbba0bf4dba29ea751d8af341ab8e5cbbdc206
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 99d583d..6fd1b9e 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -520,7 +520,7 @@ protected:
// address space. AudioFlinger::TrackBase::mBuffer is for the server address space.
void* mBuffers;
- audio_format_t mFormat;
+ audio_format_t mFormat; // as requested by client, not forced to 16-bit
audio_stream_type_t mStreamType;
uint8_t mChannelCount;
uint8_t mMuted;