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

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

Merge "hal: update pcm ids for multi offload use cases"

parents a818cb08 94c5eff4

hal/msm8916/platform.c

+18 −19
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#define MIXER_XML_PATH_WCD9330 "/system/etc/mixer_paths_wcd9330.xml"

#define MIXER_XML_PATH_WCD9335 "/system/etc/mixer_paths_wcd9335.xml"

#define PLATFORM_INFO_XML_PATH      "/system/etc/audio_platform_info.xml"

#define PLATFORM_INFO_XML_PATH_I2S  "/system/etc/audio_platform_info_i2s.xml"

#define PLATFORM_INFO_XML_PATH_EXTCODEC  "/system/etc/audio_platform_info_extcodec.xml"



#define LIB_ACDB_LOADER "libacdbloader.so"

#define AUDIO_DATA_BLOCK_MIXER_CTL "HDMI EDID"
@@ -246,22 +246,18 @@ int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_AUDIO_PLAYBACK_OFFLOAD] =

                     {PLAYBACK_OFFLOAD_DEVICE, PLAYBACK_OFFLOAD_DEVICE},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    [USECASE_AUDIO_PLAYBACK_OFFLOAD2] =

                     {PLAYBACK_OFFLOAD_DEVICE2, PLAYBACK_OFFLOAD_DEVICE2},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD3] =

                     {PLAYBACK_OFFLOAD_DEVICE3, PLAYBACK_OFFLOAD_DEVICE3},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD4] =

                     {PLAYBACK_OFFLOAD_DEVICE4, PLAYBACK_OFFLOAD_DEVICE4},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD5] =

                     {PLAYBACK_OFFLOAD_DEVICE5, PLAYBACK_OFFLOAD_DEVICE5},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD6] =

                     {PLAYBACK_OFFLOAD_DEVICE6, PLAYBACK_OFFLOAD_DEVICE6},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD7] =

                     {PLAYBACK_OFFLOAD_DEVICE7, PLAYBACK_OFFLOAD_DEVICE7},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD8] =

                     {PLAYBACK_OFFLOAD_DEVICE8, PLAYBACK_OFFLOAD_DEVICE8},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD9] =

                     {PLAYBACK_OFFLOAD_DEVICE9, PLAYBACK_OFFLOAD_DEVICE9},

    /* Below entries are initialized with invalid values

     * Valid values should be updated from fnc platform_info_init()

     * based on pcm ids defined in audio_platform_info.xml.

     */

    [USECASE_AUDIO_PLAYBACK_OFFLOAD2] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD3] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD4] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD5] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD6] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD7] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD8] = {-1, -1},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD9] = {-1, -1},

#endif

    [USECASE_AUDIO_RECORD] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},

    [USECASE_AUDIO_RECORD_COMPRESS] = {COMPRESS_CAPTURE_DEVICE, COMPRESS_CAPTURE_DEVICE},
@@ -1450,7 +1446,10 @@ acdb_init_fail: 


    set_platform_defaults();



    /* Initialize ACDB ID's */

    /* Initialize ACDB and PCM ID's */

    if (is_external_codec)

        platform_info_init(PLATFORM_INFO_XML_PATH_EXTCODEC);

    else

        platform_info_init(PLATFORM_INFO_XML_PATH);



    /* init usb */

hal/msm8916/platform.h

+0 −11
Original line number Diff line number Diff line
@@ -220,17 +220,6 @@ enum { 
#define SPKR_PROT_CALIB_TX_PCM_DEVICE 26

#define PLAYBACK_OFFLOAD_DEVICE 9



#ifdef MULTIPLE_OFFLOAD_ENABLED

#define PLAYBACK_OFFLOAD_DEVICE2 17

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 37

#define PLAYBACK_OFFLOAD_DEVICE5 38

#define PLAYBACK_OFFLOAD_DEVICE6 39

#define PLAYBACK_OFFLOAD_DEVICE7 40

#define PLAYBACK_OFFLOAD_DEVICE8 41

#define PLAYBACK_OFFLOAD_DEVICE9 42

#endif



#define COMPRESS_VOIP_CALL_PCM_DEVICE 3



/* Define macro for Internal FM volume mixer */