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

Commit fa382b71 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "audioflinger: improve mmap stream volume" into oc-dev am: 9ba03c88 

am: f417a01a

Change-Id: I34d42c70991e76d3f4c398d958ac02c92977d85e
parents 084ad5a4 f417a01a

services/audioflinger/Threads.cpp

+16 −14
Original line number Original line Diff line number Diff line
@@ -8295,9 +8295,8 @@ void AudioFlinger::MmapPlaybackThread::processVolume_l() 
            mEffectChains[0]->setVolume_l(&vol, &vol);

            mEffectChains[0]->setVolume_l(&vol, &vol);

            volume = (float)vol / (1 << 24);

            volume = (float)vol / (1 << 24);

        }

        }



        // Try to use HW volume control and fall back to SW control if not implemented

        mOutput->stream->setVolume(volume, volume);

        if (mOutput->stream->setVolume(volume, volume) != NO_ERROR) {



            sp<MmapStreamCallback> callback = mCallback.promote();

            sp<MmapStreamCallback> callback = mCallback.promote();

            if (callback != 0) {

            if (callback != 0) {

                int channelCount;

                int channelCount;
@@ -8311,6 +8310,9 @@ void AudioFlinger::MmapPlaybackThread::processVolume_l() 
                    values.add(volume);

                    values.add(volume);

                }

                }

                callback->onVolumeChanged(mChannelMask, values);

                callback->onVolumeChanged(mChannelMask, values);

            } else {

                ALOGW("Could not set MMAP stream volume: no volume callback!");

            }

        }

        }

    }

    }

}

}