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

Commit a22a6ca1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Fix for FM mute issue on start of FM record"

parents 4f014992 a5d36f16

hal/audio_extn/fm.c

+16 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#ifdef FM_ENABLED

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"

#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"



static struct pcm_config pcm_config_fm = {

    .channels = 2,
@@ -280,6 +281,21 @@ void audio_extn_fm_set_parameters(struct audio_device *adev, 
        fm_set_volume(adev, vol);

    }



#ifdef RECORD_PLAY_CONCURRENCY

    ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC,

                               value, sizeof(value));

    if ((ret >= 0)

          && (fmmod.is_fm_running == true)) {



        if (!strncmp("true", value, sizeof("true")))

            ALOGD("Record play concurrency ON Forcing FM device reroute");

        else

            ALOGD("Record play concurrency OFF Forcing FM device reroute");



        select_devices(adev, USECASE_AUDIO_PLAYBACK_FM);

        fm_set_volume(adev,fmmod.fm_volume);

    }

#endif

exit:

    ALOGV("%s: exit", __func__);

}

hal/msm8916/platform.c

+0 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,6 @@ int platform_set_parameters(void *platform, struct str_parms *parms) 
            ALOGD("setting record playback concurrency to false");

            my_data->rec_play_conc_set = false;

        }

        str_parms_del(parms, AUDIO_PARAMETER_KEY_REC_PLAY_CONC);

    }

#endif

    ALOGV("%s: exit with code(%d)", __func__, ret);