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

Commit c4f26f7b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 6da25f4f on remote branch

Change-Id: I420b5f60527000fd6384d8e749f53932a6581a0e
parents fbcef799 6da25f4f
Loading
Loading
Loading
Loading
+23 −2
Original line number Diff line number Diff line
@@ -1340,12 +1340,30 @@ static void audio_hwdep_send_cal(struct platform_data *plat_data)
        ALOGE("%s: Could not send anc cal", __FUNCTION__);
}

const char * get_snd_card_name_for_acdb_loader(const char *snd_card_name) {

    if(snd_card_name == NULL)
        return NULL;

    // Both tasha & tasha-lite uses tasha ACDB files
    // simulate sound card name for tasha lite, so that
    // ACDB module loads tasha ACDB files for tasha lite
    if(!strncmp(snd_card_name, "msm8976-tashalite-snd-card",
             sizeof("msm8976-tashalite-snd-card"))) {
       ALOGD("using tasha ACDB files for tasha-lite");
       return "msm8976-tasha-snd-card";
   } else {
       return snd_card_name;
   }
}


int platform_acdb_init(void *platform)
{
    struct platform_data *my_data = (struct platform_data *)platform;
    char *cvd_version = NULL;
    int key = 0;
    const char *snd_card_name;
    const char *snd_card_name, *acdb_snd_card_name;
    int result;
    char value[PROPERTY_VALUE_MAX];
    cvd_version = calloc(1, MAX_CVD_VERSION_STRING_SIZE);
@@ -1357,7 +1375,10 @@ int platform_acdb_init(void *platform)
    property_get("audio.ds1.metainfo.key",value,"0");
    key = atoi(value);
    snd_card_name = mixer_get_name(my_data->adev->mixer);
    result = my_data->acdb_init(snd_card_name, cvd_version, key);
    acdb_snd_card_name = get_snd_card_name_for_acdb_loader(snd_card_name);

    result = my_data->acdb_init(acdb_snd_card_name, cvd_version, key);

    if (cvd_version)
        free(cvd_version);
    if (!result) {