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

Commit 7157d285 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 compilation issues with audio FM extention"

parents 662146e3 12125e85

hal/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,8 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE)),true) 
    LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

    LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

endif

endif





ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true)

    LOCAL_CFLAGS += -DFM_ENABLED

    LOCAL_CFLAGS += -DFM_POWER_OPT

    LOCAL_SRC_FILES += audio_extn/fm.c

    LOCAL_SRC_FILES += audio_extn/fm.c

endif

endif

hal/audio_extn/audio_extn.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ static struct audio_extn_module aextnmod = { 
#define AUDIO_PARAMETER_OFFLOAD_NUM_ACTIVE "offload_num_active"

#define AUDIO_PARAMETER_OFFLOAD_NUM_ACTIVE "offload_num_active"

#define AUDIO_PARAMETER_HPX            "HPX"

#define AUDIO_PARAMETER_HPX            "HPX"





#ifndef FM_ENABLED

#ifndef FM_POWER_OPT

#define audio_extn_fm_set_parameters(adev, parms) (0)

#define audio_extn_fm_set_parameters(adev, parms) (0)

#else

#else

void audio_extn_fm_set_parameters(struct audio_device *adev,

void audio_extn_fm_set_parameters(struct audio_device *adev,

hal/audio_extn/audio_extn.h

+2 −7
Original line number Original line Diff line number Diff line
@@ -59,13 +59,8 @@ 
#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000

#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000

#endif

#endif





#ifndef FM_ENABLED

#ifndef AUDIO_DEVICE_OUT_FM_TX

#define AUDIO_DEVICE_OUT_FM 0x80000

#define AUDIO_DEVICE_OUT_FM_TX 0x8000000

#define AUDIO_DEVICE_OUT_FM_TX 0x100000

#define AUDIO_SOURCE_FM_RX 9

#define AUDIO_SOURCE_FM_RX_A2DP 10

#define AUDIO_DEVICE_IN_FM_RX (AUDIO_DEVICE_BIT_IN | 0x8000)

#define AUDIO_DEVICE_IN_FM_RX_A2DP (AUDIO_DEVICE_BIT_IN | 0x10000)

#endif

#endif





#ifndef FLAC_OFFLOAD_ENABLED

#ifndef FLAC_OFFLOAD_ENABLED

hal/audio_extn/fm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <cutils/str_parms.h>

#include <cutils/str_parms.h>





#ifdef FM_ENABLED

#ifdef FM_POWER_OPT

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"

#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"

#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"

#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
@@ -304,4 +304,4 @@ void audio_extn_fm_set_parameters(struct audio_device *adev, 
exit:

exit:

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

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

}

}

#endif /* FM_ENABLED end */
 
#endif /* FM_POWER_OPT end */

hal/msm8916/platform.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -2808,9 +2808,7 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                }

                }

            }

            }

        }

        }

    } else if (source == AUDIO_SOURCE_FM_RX ||

    } else if (source == AUDIO_SOURCE_FM_TUNER) {

               source == AUDIO_SOURCE_FM_RX_A2DP ||

               source == AUDIO_SOURCE_FM_TUNER) {

        snd_device = SND_DEVICE_IN_CAPTURE_FM;

        snd_device = SND_DEVICE_IN_CAPTURE_FM;

    } else if (source == AUDIO_SOURCE_DEFAULT) {

    } else if (source == AUDIO_SOURCE_DEFAULT) {

        goto exit;

        goto exit;
@@ -2853,8 +2851,7 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (in_device & AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET ||

        } else if (in_device & AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET ||

                   in_device & AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET) {

                   in_device & AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET) {

            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC;

            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_FM_RX ||

        } else if (in_device & AUDIO_DEVICE_IN_FM_TUNER) {

                   in_device & AUDIO_DEVICE_IN_FM_TUNER) {

            snd_device = SND_DEVICE_IN_CAPTURE_FM;

            snd_device = SND_DEVICE_IN_CAPTURE_FM;

        } else {

        } else {

            ALOGE("%s: Unknown input device(s) %#x", __func__, in_device);

            ALOGE("%s: Unknown input device(s) %#x", __func__, in_device);
@@ -3538,8 +3535,7 @@ int64_t platform_render_latency(audio_usecase_t usecase) 
int platform_update_usecase_from_source(int source, int usecase)

int platform_update_usecase_from_source(int source, int usecase)

{

{

    ALOGV("%s: input source :%d", __func__, source);

    ALOGV("%s: input source :%d", __func__, source);

    if (source == AUDIO_SOURCE_FM_RX_A2DP ||

    if (source == AUDIO_SOURCE_FM_TUNER)

        source == AUDIO_SOURCE_FM_TUNER)

        usecase = USECASE_AUDIO_RECORD_FM_VIRTUAL;

        usecase = USECASE_AUDIO_RECORD_FM_VIRTUAL;

    return usecase;

    return usecase;

}

}