diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2024-05-03 16:26:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 16:26:43 +0000 |
| commit | c0a1ab764ea70a6f11f04a8e8330c8cdbbe06b8b (patch) | |
| tree | 58080e4d70b1b21f06bee6885a30094767b73df3 | |
| parent | 383c687f7cab0efbeaedfa5d232e975270ead6cd (diff) | |
| parent | f4fc9eefcbf2b7fc9758686f12e3417edafbe368 (diff) | |
| download | av-c0a1ab764ea70a6f11f04a8e8330c8cdbbe06b8b.tar.gz | |
Merge "av: Fix volume count sent to HAL" into main
| -rw-r--r-- | media/libaudiohal/impl/StreamHalAidl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp index 70e7949491..9d404a0d56 100644 --- a/media/libaudiohal/impl/StreamHalAidl.cpp +++ b/media/libaudiohal/impl/StreamHalAidl.cpp @@ -620,7 +620,7 @@ status_t StreamOutHalAidl::getLatency(uint32_t *latency) { 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) { |