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

Commit e56b485b authored by Helen Zeng's avatar Helen Zeng
Browse files

hal: Use compress audio for incall recording with AMR WB 

Currently, AMR WB recording uses tunnel mode instead of
software encoding. Update audio hal to use compress audio
path to do incall recording with AMR WB format.

Change-Id: I93deb3dbc7dcd6a8d2b178334f8b43117ee6841c
CRs-Fixed: 581298
parent cd91032a

hal/audio_extn/compress_capture.c

+4 −1
Original line number Diff line number Diff line
@@ -93,7 +93,10 @@ bool audio_extn_compr_cap_format_supported(audio_format_t format) 


bool audio_extn_compr_cap_usecase_supported(audio_usecase_t usecase)

{

    if (usecase == USECASE_AUDIO_RECORD_COMPRESS)

    if ((usecase == USECASE_AUDIO_RECORD_COMPRESS) ||

        (usecase == USECASE_INCALL_REC_UPLINK_COMPRESS) ||

        (usecase == USECASE_INCALL_REC_DOWNLINK_COMPRESS) ||

        (usecase == USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS))

        return true;

    else

        return false;

hal/audio_hw.c

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_INCALL_REC_UPLINK] = "incall-rec-uplink",

    [USECASE_INCALL_REC_DOWNLINK] = "incall-rec-downlink",

    [USECASE_INCALL_REC_UPLINK_AND_DOWNLINK] = "incall-rec-uplink-and-downlink",

    [USECASE_INCALL_REC_UPLINK_COMPRESS] = "incall-rec-uplink-compress",

    [USECASE_INCALL_REC_DOWNLINK_COMPRESS] = "incall-rec-downlink-compress",

    [USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS] = "incall-rec-uplink-and-downlink-compress",



    [USECASE_INCALL_MUSIC_UPLINK] = "incall_music_uplink",

    [USECASE_INCALL_MUSIC_UPLINK2] = "incall_music_uplink2",

    [USECASE_AUDIO_SPKR_CALIB_RX] = "spkr-rx-calib",

hal/audio_hw.h

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ typedef enum { 
    USECASE_INCALL_REC_UPLINK,

    USECASE_INCALL_REC_DOWNLINK,

    USECASE_INCALL_REC_UPLINK_AND_DOWNLINK,

    USECASE_INCALL_REC_UPLINK_COMPRESS,

    USECASE_INCALL_REC_DOWNLINK_COMPRESS,

    USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS,



    USECASE_INCALL_MUSIC_UPLINK,

    USECASE_INCALL_MUSIC_UPLINK2,

hal/msm8974/platform.c

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ static const int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
                                     AUDIO_RECORD_PCM_DEVICE},

    [USECASE_INCALL_REC_UPLINK_AND_DOWNLINK] = {AUDIO_RECORD_PCM_DEVICE,

                                                AUDIO_RECORD_PCM_DEVICE},

    [USECASE_INCALL_REC_UPLINK_COMPRESS] = {COMPRESS_CAPTURE_DEVICE,

                                            COMPRESS_CAPTURE_DEVICE},

    [USECASE_INCALL_REC_DOWNLINK_COMPRESS] = {COMPRESS_CAPTURE_DEVICE,

                                              COMPRESS_CAPTURE_DEVICE},

    [USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS] = {COMPRESS_CAPTURE_DEVICE,

                                                         COMPRESS_CAPTURE_DEVICE},

    [USECASE_INCALL_MUSIC_UPLINK] = {INCALL_MUSIC_UPLINK_PCM_DEVICE,

                                     INCALL_MUSIC_UPLINK_PCM_DEVICE},

    [USECASE_INCALL_MUSIC_UPLINK2] = {INCALL_MUSIC_UPLINK2_PCM_DEVICE,

hal/voice.c

+15 −3
Original line number Diff line number Diff line
@@ -212,14 +212,26 @@ int voice_check_and_set_incall_rec_usecase(struct audio_device *adev, 
    if (voice_is_in_call(adev)) {

        switch (in->source) {

        case AUDIO_SOURCE_VOICE_UPLINK:

            if (audio_extn_compr_cap_enabled() &&

                audio_extn_compr_cap_format_supported(in->config.format)) {

                in->usecase = USECASE_INCALL_REC_UPLINK_COMPRESS;

            } else

                in->usecase = USECASE_INCALL_REC_UPLINK;

            rec_mode = INCALL_REC_UPLINK;

            break;

        case AUDIO_SOURCE_VOICE_DOWNLINK:

            if (audio_extn_compr_cap_enabled() &&

                audio_extn_compr_cap_format_supported(in->config.format)) {

                in->usecase = USECASE_INCALL_REC_DOWNLINK_COMPRESS;

            } else

                in->usecase = USECASE_INCALL_REC_DOWNLINK;

            rec_mode = INCALL_REC_DOWNLINK;

            break;

        case AUDIO_SOURCE_VOICE_CALL:

            if (audio_extn_compr_cap_enabled() &&

                audio_extn_compr_cap_format_supported(in->config.format)) {

                in->usecase = USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS;

            } else

                in->usecase = USECASE_INCALL_REC_UPLINK_AND_DOWNLINK;

            rec_mode = INCALL_REC_UPLINK_AND_DOWNLINK;

            break;