Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9be946d authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "av: Fix volume count sent to HAL" into main am: c0a1ab76 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3071183



Change-Id: Ic19cd952c67184c1560b566bedf4faa59e973932
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9346da1 c0a1ab76

media/libaudiohal/impl/StreamHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {