diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-24 15:19:07 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-02-24 17:21:37 -0800 |
| commit | e3247bf8dd4f8fa8dfa3a108260241ae4a967569 (patch) | |
| tree | 9b1ffe395ab3c15a4baa71bcb91022a2a2f21bb0 /media/libmedia/AudioTrack.cpp | |
| parent | 11cb175005db0090345f44bfa049b52fd8c809b8 (diff) | |
| download | frameworks_av-e3247bf8dd4f8fa8dfa3a108260241ae4a967569.zip frameworks_av-e3247bf8dd4f8fa8dfa3a108260241ae4a967569.tar.gz frameworks_av-e3247bf8dd4f8fa8dfa3a108260241ae4a967569.tar.bz2 | |
Update channel fields at same place in AudioTrack and AudioRecord
Change-Id: I4b649feeef47e7968a9fa3a460217017ca9b05fe
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 46025c0..0eb0915 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -293,6 +293,9 @@ status_t AudioTrack::set( ALOGE("Invalid channel mask %#x", channelMask); return BAD_VALUE; } + mChannelMask = channelMask; + uint32_t channelCount = popcount(channelMask); + mChannelCount = channelCount; // AudioFlinger does not currently support 8-bit data in shared memory if (format == AUDIO_FORMAT_PCM_8_BIT && sharedBuffer != 0) { @@ -316,10 +319,6 @@ status_t AudioTrack::set( flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER); } - mChannelMask = channelMask; - uint32_t channelCount = popcount(channelMask); - mChannelCount = channelCount; - if (audio_is_linear_pcm(format)) { mFrameSize = channelCount * audio_bytes_per_sample(format); mFrameSizeAF = channelCount * sizeof(int16_t); |