diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-25 20:57:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 20:57:36 +0000 |
| commit | 6c69333431b2fdd995a1c2eb6f01182155f4a691 (patch) | |
| tree | fd5c1177c9df607313b94669b27a4c268f3293cc /media/libmedia | |
| parent | 882469cfe767188a4c67d2d83f3d72ab553a4818 (diff) | |
| parent | e3247bf8dd4f8fa8dfa3a108260241ae4a967569 (diff) | |
| download | frameworks_av-6c69333431b2fdd995a1c2eb6f01182155f4a691.zip frameworks_av-6c69333431b2fdd995a1c2eb6f01182155f4a691.tar.gz frameworks_av-6c69333431b2fdd995a1c2eb6f01182155f4a691.tar.bz2 | |
Merge "Update channel fields at same place in AudioTrack and AudioRecord"
Diffstat (limited to 'media/libmedia')
| -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); |