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

Commit a138f79f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: notify device info twice for combo output"

parents 418acb11 27dd145f

hal/audio_hw.c

+0 −10
Original line number Diff line number Diff line
@@ -2705,16 +2705,6 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
    }

    enable_audio_route(adev, usecase);



    /* Notify device change info to effect clients registered */

    if (usecase->type == PCM_PLAYBACK) {

        audio_extn_gef_notify_device_config(

                usecase->stream.out->devices,

                usecase->stream.out->channel_mask,

                usecase->stream.out->app_type_cfg.sample_rate,

                platform_get_snd_device_acdb_id(usecase->out_snd_device),

                usecase->stream.out->app_type_cfg.app_type);

    }



    audio_extn_qdsp_set_device(usecase);



    /* If input stream is already running then effect needs to be

hal/msm8916/platform.c

+11 −0
Original line number Diff line number Diff line
@@ -3719,6 +3719,17 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
                  __func__, new_snd_device[i]);

            return -EINVAL;

        }



        /* Notify device change info to effect clients registered */

        if (usecase->type == PCM_PLAYBACK) {

            audio_extn_gef_notify_device_config(

                    usecase->stream.out->devices,

                    usecase->stream.out->channel_mask,

                    sample_rate,

                    acdb_dev_id,

                    usecase->stream.out->app_type_cfg.app_type);

        }



        ALOGV("%s: sending audio calibration for snd_device(%d) acdb_id(%d)",

              __func__, new_snd_device[i], acdb_dev_id);

        if (new_snd_device[i] >= SND_DEVICE_OUT_BEGIN &&

hal/msm8960/platform.c

+11 −0
Original line number Diff line number Diff line
@@ -559,6 +559,17 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
              __func__, snd_device);

        return -EINVAL;

    }



    /* Notify device change info to effect clients registered */

    if (usecase->type == PCM_PLAYBACK) {

        audio_extn_gef_notify_device_config(

                usecase->stream.out->devices,

                usecase->stream.out->channel_mask,

                usecase->stream.out->app_type_cfg.sample_rate,

                acdb_dev_id,

                usecase->stream.out->app_type_cfg.app_type);

    }



    if (my_data->acdb_send_audio_cal) {

        ("%s: sending audio calibration for snd_device(%d) acdb_id(%d)",

              __func__, snd_device, acdb_dev_id);

hal/msm8974/platform.c

+11 −0
Original line number Diff line number Diff line
@@ -4981,6 +4981,17 @@ int platform_send_audio_calibration(void *platform, struct audio_usecase *usecas 
                  __func__, new_snd_device[i]);

            return -EINVAL;

        }



        /* Notify device change info to effect clients registered */

        if (usecase->type == PCM_PLAYBACK) {

            audio_extn_gef_notify_device_config(

                    usecase->stream.out->devices,

                    usecase->stream.out->channel_mask,

                    sample_rate,

                    acdb_dev_id,

                    usecase->stream.out->app_type_cfg.app_type);

        }



        ALOGV("%s: sending audio calibration for snd_device(%d) acdb_id(%d)",

              __func__, new_snd_device[i], acdb_dev_id);

        if (new_snd_device[i] >= SND_DEVICE_OUT_BEGIN &&