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

Commit 6c9fe830 authored by Satish Babu Patakokila's avatar Satish Babu Patakokila Committed by Gerrit - the friendly Code Review server
Browse files

hal/usb: Add initial volume setting for USB headset 

Some USB headsets start at 0 volume because of this even
if the Media Player volume is maximum cannot hear any audio.
Initialize device volume before starting the playback.

Change-Id: Ie6940fae6fd7946ce0a90a142aaf110d829eea8f
CRs-Fixed: 639168
parent d4640f3f

hal/audio_extn/audio_extn.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ int32_t audio_extn_get_afe_proxy_channel_count(); 
#define audio_extn_usb_set_proxy_sound_card(sndcard_idx) (0)

#define audio_extn_usb_is_proxy_inuse()                  (0)

#else

void initPlaybackVolume();

void audio_extn_usb_init(void *adev);

void audio_extn_usb_deinit();

void audio_extn_usb_start_playback(void *adev);

hal/audio_extn/usb.c

+39 −1
Original line number Diff line number Diff line
@@ -96,6 +96,42 @@ static void usb_alloc() 
    usbmod = calloc(1, sizeof(struct usb_module));

}



// Some USB audio accessories have a really low default volume set. Look for a suitable

// volume control and set the volume to default volume level.

static void initPlaybackVolume() {

    ALOGD("initPlaybackVolume");

    struct mixer *usbMixer = mixer_open(1);



    if (usbMixer) {

         struct mixer_ctl *ctl = NULL;

         unsigned int usbPlaybackVolume;

         unsigned int i;

         unsigned int num_ctls = mixer_get_num_ctls(usbMixer);



         // Look for the first control named ".*Playback Volume" that isn't for a microphone

         for (i = 0; i < num_ctls; i++) {

             ctl = mixer_get_ctl(usbMixer, i);

             if (strstr((const char *)mixer_ctl_get_name(ctl), "Playback Volume") &&

                 !strstr((const char *)mixer_ctl_get_name(ctl), "Mic")) {

                   break;

             }

         }

         if (ctl != NULL) {

            ALOGD("Found a volume control for USB: %s", mixer_ctl_get_name(ctl) );

            usbPlaybackVolume = mixer_ctl_get_value(ctl, 0);

            ALOGD("Value got from mixer_ctl_get is:%u", usbPlaybackVolume);

            if (mixer_ctl_set_value(ctl,0,usbPlaybackVolume) < 0) {

               ALOGE("Failed to set volume; default volume might be used");

            }

         } else {

            ALOGE("No playback volume control found; default volume will be used");

         }

         mixer_close(usbMixer);

    } else {

         ALOGE("Failed to open mixer for card 1");

    }

}



static int usb_get_numof_rates(char *rates_str)

{

    int i, size = 0;
@@ -340,7 +376,7 @@ static int32_t usb_playback_entry(void *adev) 
    pcm_config_usbmod.channels = usbmod->channels_playback;

    pcm_config_usbmod.period_count = AFE_PROXY_PERIOD_COUNT;

    usbmod->proxy_device_id = AFE_PROXY_PLAYBACK_DEVICE;

    ALOGV("%s: proxy device %u:period %u:channels %u:sample", __func__,

    ALOGD("%s: proxy device %u:period %u:channels %u:sample", __func__,

          pcm_config_usbmod.period_size, pcm_config_usbmod.channels,

          pcm_config_usbmod.rate);
@@ -375,6 +411,8 @@ static int32_t usb_playback_entry(void *adev) 
    ALOGD("%s: PROXY configured for playback", __func__);

    pthread_mutex_unlock(&usbmod->usb_playback_lock);



    ALOGD("Init USB volume");

    initPlaybackVolume();

    /* main loop to read from proxy and write to usb */

    while (usbmod->is_playback_running) {

        /* read data from proxy */