diff options
author | Glenn Kasten <gkasten@google.com> | 2012-11-14 12:47:55 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-11-19 11:25:58 -0800 |
commit | a42ff007a17d63df22c60dd5e5fd811ee45ca1b3 (patch) | |
tree | 58ba8c1bf24f27680d48b6040132a02bfaedc0ff /services/audioflinger/AudioFlinger.h | |
parent | aa25c0321bd4b9eb46a4d1cb4ac5fa47af30eeb4 (diff) | |
download | frameworks_av-a42ff007a17d63df22c60dd5e5fd811ee45ca1b3.zip frameworks_av-a42ff007a17d63df22c60dd5e5fd811ee45ca1b3.tar.gz frameworks_av-a42ff007a17d63df22c60dd5e5fd811ee45ca1b3.tar.bz2 |
Clean up channel count and channel mask
Channel count is uint32_t.
Remove redundant mask parameter to AudioTrack::createTrack_l()
and AudioRecord::openRecord_l().
Change-Id: I5dc2b18eb609b2c0dc3091994cbaa4628062c17f
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 61f459c..2541b15 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -419,7 +419,7 @@ private: return mFormat; } - int channelCount() const { return mChannelCount; } + uint32_t channelCount() const { return mChannelCount; } audio_channel_mask_t channelMask() const { return mChannelMask; } @@ -565,7 +565,7 @@ private: // dynamic externally-visible uint32_t sampleRate() const { return mSampleRate; } - int channelCount() const { return mChannelCount; } + uint32_t channelCount() const { return mChannelCount; } audio_channel_mask_t channelMask() const { return mChannelMask; } audio_format_t format() const { return mFormat; } // Called by AudioFlinger::frameCount(audio_io_handle_t output) and effects, @@ -1593,7 +1593,7 @@ public: int16_t *mRsmpInBuffer; size_t mRsmpInIndex; size_t mInputBytes; - const int mReqChannelCount; + const uint32_t mReqChannelCount; const uint32_t mReqSampleRate; ssize_t mBytesRead; // sync event triggering actual audio capture. Frames read before this event will |