| commit | 2f9438b426ba386d2866c9c89b02ea0f9f0e8a27 | [log] [tgz] |
|---|---|---|
| author | Jaideep Sharma <quic_jaidshar@quicinc.com> | Thu May 02 12:43:26 2024 +0530 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri May 03 16:32:21 2024 +0000 |
| tree | bf01895861698622dfed40365afe4ca03434d6ad | |
| parent | b537e909100a79fcf4904c1b7bd4c9fadf565fce [diff] [blame] |
av: Fix volume count sent to HAL Use audio_channel_count_from_out_mask to properly calculate the channel count from the mask, so a valid volume array can be sent to audio hal. Test: play a clip check volume array sent to hal Bug: 326853618 (cherry picked from https://android-review.googlesource.com/q/commit:f4fc9eefcbf2b7fc9758686f12e3417edafbe368) Merged-In: I59b815f8f4eb16b4aeb2941330b023320adf95e2 Change-Id: I59b815f8f4eb16b4aeb2941330b023320adf95e2
diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp index 09df8d6..2812652 100644 --- a/media/libaudiohal/impl/StreamHalAidl.cpp +++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -616,7 +616,7 @@ status_t StreamOutHalAidl::setVolume(float left, float right) { TIME_CHECK(); if (!mStream) return NO_INIT; - size_t channelCount = audio_channel_out_mask_from_count(mConfig.channel_mask); + size_t channelCount = audio_channel_count_from_out_mask(mConfig.channel_mask); if (channelCount == 0) channelCount = 2; std::vector<float> volumes(channelCount); if (channelCount == 1) {