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

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

Merge "hal: add FM_TUNER capture support"

parents e199d8c4 5bba6cbc

hal/msm8916/platform.c

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

        }

    } else if (source == AUDIO_SOURCE_FM_RX ||

               source == AUDIO_SOURCE_FM_RX_A2DP) {

               source == AUDIO_SOURCE_FM_RX_A2DP ||

               source == AUDIO_SOURCE_FM_TUNER) {

        snd_device = SND_DEVICE_IN_CAPTURE_FM;

    } else if (source == AUDIO_SOURCE_DEFAULT) {

        goto exit;
@@ -2646,7 +2647,8 @@ 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 ||

                   in_device & AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET) {

            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_RX ||

                   in_device & AUDIO_DEVICE_IN_FM_TUNER) {

            snd_device = SND_DEVICE_IN_CAPTURE_FM;

        } else {

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

{

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

    if(source == AUDIO_SOURCE_FM_RX_A2DP)

    if (source == AUDIO_SOURCE_FM_RX_A2DP ||

        source == AUDIO_SOURCE_FM_TUNER)

        usecase = USECASE_AUDIO_RECORD_FM_VIRTUAL;

    return usecase;

}

hal/msm8974/platform.c

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

        }

    } else if (source == AUDIO_SOURCE_FM_RX ||

               source == AUDIO_SOURCE_FM_RX_A2DP) {

               source == AUDIO_SOURCE_FM_RX_A2DP||

               source == AUDIO_SOURCE_FM_TUNER) {

        snd_device = SND_DEVICE_IN_CAPTURE_FM;

    } else if (source == AUDIO_SOURCE_DEFAULT) {

        goto exit;
@@ -2551,7 +2552,8 @@ 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 ||

                   in_device & AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET) {

            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_RX ||

                   in_device & AUDIO_DEVICE_IN_FM_TUNER) {

            snd_device = SND_DEVICE_IN_CAPTURE_FM;

        } else {

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

{

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

    if(source == AUDIO_SOURCE_FM_RX_A2DP)

    if (source == AUDIO_SOURCE_FM_RX_A2DP ||

        source == AUDIO_SOURCE_FM_TUNER)

        usecase = USECASE_AUDIO_RECORD_FM_VIRTUAL;

    return usecase;

}