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

Commit 9bc8358d authored by Eric Laurent's avatar Eric Laurent
Browse files

audio framework: manage stream volume per device 

Improve volume management by keeping track of volume for each type
of device independently.
Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained
per device.

The main changes are:
- AudioService now keeps tracks of stream volumes per device:
 volume indexes are kept in a HashMap < device , index>.
 active device is queried from policy manager when a volume change request
 is received
 initalization, mute and unmute happen on all device simultaneously
- Settings: suffixes is added to volume keys to store each device
volume independently.
- AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument
to setStreamVolumeIndex() and getStreamVolumeIndex() to address each
device independently.
- AudioPolicyManagerBase: keep track of stream volumes for each device
and apply volume according to current device selection.

Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
parent cc767191

core/jni/android_media_AudioSystem.cpp

+19 −6
Original line number Diff line number Diff line
@@ -183,16 +183,29 @@ android_media_AudioSystem_initStreamVolume(JNIEnv *env, jobject thiz, jint strea 
}



static int

android_media_AudioSystem_setStreamVolumeIndex(JNIEnv *env, jobject thiz, jint stream, jint index)

android_media_AudioSystem_setStreamVolumeIndex(JNIEnv *env,

                                               jobject thiz,

                                               jint stream,

                                               jint index,

                                               jint device)

{

    return check_AudioSystem_Command(AudioSystem::setStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), index));

    return check_AudioSystem_Command(

            AudioSystem::setStreamVolumeIndex(static_cast <audio_stream_type_t>(stream),

                                              index,

                                              (audio_devices_t)device));

}



static int

android_media_AudioSystem_getStreamVolumeIndex(JNIEnv *env, jobject thiz, jint stream)

android_media_AudioSystem_getStreamVolumeIndex(JNIEnv *env,

                                               jobject thiz,

                                               jint stream,

                                               jint device)

{

    int index;

    if (AudioSystem::getStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), &index) != NO_ERROR) {

    if (AudioSystem::getStreamVolumeIndex(static_cast <audio_stream_type_t>(stream),

                                          &index,

                                          (audio_devices_t)device)

            != NO_ERROR) {

        index = -1;

    }

    return index;
@@ -219,8 +232,8 @@ static JNINativeMethod gMethods[] = { 
    {"setForceUse",         "(II)I",    (void *)android_media_AudioSystem_setForceUse},

    {"getForceUse",         "(I)I",     (void *)android_media_AudioSystem_getForceUse},

    {"initStreamVolume",    "(III)I",   (void *)android_media_AudioSystem_initStreamVolume},

    {"setStreamVolumeIndex","(II)I",    (void *)android_media_AudioSystem_setStreamVolumeIndex},

    {"getStreamVolumeIndex","(I)I",     (void *)android_media_AudioSystem_getStreamVolumeIndex},

    {"setStreamVolumeIndex","(III)I",   (void *)android_media_AudioSystem_setStreamVolumeIndex},

    {"getStreamVolumeIndex","(II)I",    (void *)android_media_AudioSystem_getStreamVolumeIndex},

    {"getDevicesForStream", "(I)I",     (void *)android_media_AudioSystem_getDevicesForStream},

};

include/media/AudioSystem.h

+6 −2
Original line number Diff line number Diff line
@@ -170,8 +170,12 @@ public: 
    static status_t initStreamVolume(audio_stream_type_t stream,

                                      int indexMin,

                                      int indexMax);

    static status_t setStreamVolumeIndex(audio_stream_type_t stream, int index);

    static status_t getStreamVolumeIndex(audio_stream_type_t stream, int *index);

    static status_t setStreamVolumeIndex(audio_stream_type_t stream,

                                         int index,

                                         audio_devices_t device);

    static status_t getStreamVolumeIndex(audio_stream_type_t stream,

                                         int *index,

                                         audio_devices_t device);



    static uint32_t getStrategyForStream(audio_stream_type_t stream);

    static uint32_t getDevicesForStream(audio_stream_type_t stream);

include/media/IAudioPolicyService.h

+6 −2
Original line number Diff line number Diff line
@@ -73,8 +73,12 @@ public: 
    virtual status_t initStreamVolume(audio_stream_type_t stream,

                                      int indexMin,

                                      int indexMax) = 0;

    virtual status_t setStreamVolumeIndex(audio_stream_type_t stream, int index) = 0;

    virtual status_t getStreamVolumeIndex(audio_stream_type_t stream, int *index) = 0;

    virtual status_t setStreamVolumeIndex(audio_stream_type_t stream,

                                          int index,

                                          audio_devices_t device) = 0;

    virtual status_t getStreamVolumeIndex(audio_stream_type_t stream,

                                          int *index,

                                          audio_devices_t device) = 0;

    virtual uint32_t getStrategyForStream(audio_stream_type_t stream) = 0;

    virtual uint32_t getDevicesForStream(audio_stream_type_t stream) = 0;

    virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc) = 0;