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

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

Merge "audio: fix misc defects in AHAL"

parents 7865194a 29c08a46

hal/audio_extn/audio_extn.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <cutils/properties.h>

#include <log/log.h>

#include <unistd.h>

#include <sched.h>



#include "audio_hw.h"

#include "audio_extn.h"

hal/audio_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -5098,6 +5098,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void *buffer, 
                    pthread_mutex_lock(&adev->lock);

                    select_devices(adev, out->usecase);

                    if (!audio_extn_passthru_is_supported_backend_edid_cfg(adev, out)) {

                        pthread_mutex_unlock(&adev->lock);

                        ret = -EINVAL;

                        goto exit;

                    }

hal/msm8916/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -1993,6 +1993,10 @@ int platform_acdb_init(void *platform) 


    snd_card_name = mixer_get_name(my_data->adev->mixer);

    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);

    if (!snd_card_name) {

        ALOGE("Failed to get snd_card_name");

        goto cleanup;

    }



    my_data->acdb_init_data.cvd_version = cvd_version;

    my_data->acdb_init_data.snd_card_name = strdup(snd_card_name);
@@ -2014,6 +2018,7 @@ int platform_acdb_init(void *platform) 
    strlcpy(my_data->snd_card_name, snd_card_name,

                                               MAX_SND_CARD_STRING_SIZE);



cleanup:

    if (cvd_version)

        free(cvd_version);

    if (!result) {

hal/msm8974/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -2514,11 +2514,11 @@ static int platform_acdb_init(void *platform) 
    }



    snd_card_name = mixer_get_name(my_data->adev->mixer);

    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);

    if (!snd_card_name) {

        ALOGE("Failed to get snd_card_name");

        goto cleanup;

    }

    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);



    my_data->acdb_init_data.cvd_version = cvd_version;

    my_data->acdb_init_data.snd_card_name = strdup(snd_card_name);