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

Commit fb5a8bba authored by Amit Shekhar's avatar Amit Shekhar Committed by android-build-merger
Browse files

hal: Support config selection for playback on speaker 

am: 6ffa3384

* commit '6ffa3384':
  hal: Support config selection for playback on speaker
parents 6b8981ad 6ffa3384

msm8909/hal/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -195,6 +195,11 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SPLIT_A2DP)),true) 
endif





ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SOURCE_TRACKING)),true)

    LOCAL_CFLAGS += -DSOURCE_TRACKING_ENABLED

    LOCAL_SRC_FILES += audio_extn/source_track.c

endif



LOCAL_SHARED_LIBRARIES := \

	liblog \

	libcutils \

msm8909/hal/audio_extn/audio_extn.c

+13 −1
Original line number Diff line number Diff line
@@ -71,6 +71,17 @@ void audio_extn_hfp_set_parameters(struct audio_device *adev, 
                                           struct str_parms *parms);

#endif



#ifndef SOURCE_TRACKING_ENABLED

#define audio_extn_source_track_set_parameters(adev, parms) (0)

#define audio_extn_source_track_get_parameters(adev, query, reply) (0)

#else

void audio_extn_source_track_set_parameters(struct audio_device *adev,

                                            struct str_parms *parms);

void audio_extn_source_track_get_parameters(struct audio_device *adev,

                                            struct str_parms *query,

                                            struct str_parms *reply);

#endif



#ifndef CUSTOM_STEREO_ENABLED

#define audio_extn_customstereo_set_parameters(adev, parms)         (0)

#else
@@ -468,6 +479,7 @@ void audio_extn_set_parameters(struct audio_device *adev, 
   audio_extn_ds2_set_parameters(adev, parms);

   audio_extn_customstereo_set_parameters(adev, parms);

   audio_extn_pm_set_parameters(parms);

   audio_extn_source_track_set_parameters(adev, parms);

}



void audio_extn_get_parameters(const struct audio_device *adev,
@@ -478,7 +490,7 @@ void audio_extn_get_parameters(const struct audio_device *adev, 
    audio_extn_get_afe_proxy_parameters(query, reply);

    audio_extn_get_fluence_parameters(adev, query, reply);

    get_active_offload_usecases(adev, query, reply);



    audio_extn_source_track_get_parameters(adev, query, reply);

    kv_pairs = str_parms_to_str(reply);

    ALOGD_IF(kv_pairs != NULL, "%s: returns %s", __func__, kv_pairs);

    free(kv_pairs);

msm8909/hal/audio_extn/source_track.c

0 → 100644
+640 −0

File added.

Preview size limit exceeded, changes collapsed.

msm8909/hal/audio_extn/utils.c

+3 −0
Original line number Diff line number Diff line
@@ -441,6 +441,9 @@ void audio_extn_utils_update_stream_app_type_cfg(void *platform, 


    if ((24 == bit_width) &&

        (devices & AUDIO_DEVICE_OUT_SPEAKER)) {

        int32_t bw = platform_get_snd_device_bit_width(SND_DEVICE_OUT_SPEAKER);

        if (-ENOSYS != bw)

            bit_width = (uint32_t)bw;

        sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

        ALOGI("%s Allowing 24-bit playback on speaker ONLY at default sampling rate", __func__);

    }

msm8909/hal/audio_hw.c

+4 −3
Original line number Diff line number Diff line
@@ -727,14 +727,15 @@ static int read_hdmi_channel_masks(struct stream_out *out) 
    return ret;

}



static audio_usecase_t get_voice_usecase_id_from_list(struct audio_device *adev)

audio_usecase_t get_usecase_id_from_usecase_type(struct audio_device *adev,

                                                 usecase_type_t type)

{

    struct audio_usecase *usecase;

    struct listnode *node;



    list_for_each(node, &adev->usecase_list) {

        usecase = node_to_item(node, struct audio_usecase, list);

        if (usecase->type == VOICE_CALL) {

        if (usecase->type == type) {

            ALOGV("%s: usecase id %d", __func__, usecase->id);

            return usecase->id;

        }
@@ -791,7 +792,7 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
         */

        if (voice_is_in_call(adev) && adev->mode == AUDIO_MODE_IN_CALL) {

            vc_usecase = get_usecase_from_list(adev,

                                               get_voice_usecase_id_from_list(adev));

                                               get_usecase_id_from_usecase_type(adev, VOICE_CALL));

            if ((vc_usecase) && ((vc_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||

                (usecase->devices == AUDIO_DEVICE_IN_VOICE_CALL))) {

                in_snd_device = vc_usecase->in_snd_device;