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

Commit 26d44527 authored by Steve Kondik's avatar Steve Kondik
Browse files

hal: Trivial cleanups 

Change-Id: I49583e0e37665f2a2b0b196944406fc2a7ebc898
parent faefb32f

hal/audio_hw.c

+5 −5
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_AUDIO_PLAYBACK_LOW_LATENCY] = "low-latency-playback",

    [USECASE_AUDIO_PLAYBACK_MULTI_CH] = "multi-channel-playback",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD] = "compress-offload-playback",

    [USECASE_AUDIO_PLAYBACK_ULL] = "audio-ull-playback",

#ifdef MULTIPLE_OFFLOAD_ENABLED

    [USECASE_AUDIO_PLAYBACK_OFFLOAD2] = "compress-offload-playback2",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD3] = "compress-offload-playback3",
@@ -166,7 +167,6 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_AUDIO_PLAYBACK_OFFLOAD9] = "compress-offload-playback9",

#endif

    [USECASE_AUDIO_DIRECT_PCM_OFFLOAD] = "compress-offload-playback2",

    [USECASE_AUDIO_PLAYBACK_ULL] = "audio-ull-playback",

    [USECASE_AUDIO_RECORD] = "audio-record",

    [USECASE_AUDIO_RECORD_COMPRESS] = "audio-record-compress",

    [USECASE_AUDIO_RECORD_LOW_LATENCY] = "low-latency-record",
@@ -2930,15 +2930,15 @@ static int adev_open_output_stream(struct audio_hw_device *dev, 
        out->config = pcm_config_afe_proxy_playback;

        adev->voice_tx_output = out;

    } else {

        if (out->flags & AUDIO_OUTPUT_FLAG_RAW) {

        if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {

            out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;

            out->config = pcm_config_deep_buffer;

        } else if (out->flags & AUDIO_OUTPUT_FLAG_RAW) {

            out->usecase = USECASE_AUDIO_PLAYBACK_ULL;

            out->config = pcm_config_low_latency;

        } else if (out->flags & AUDIO_OUTPUT_FLAG_FAST) {

            out->usecase = USECASE_AUDIO_PLAYBACK_LOW_LATENCY;

            out->config = pcm_config_low_latency;

        } if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {

            out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;

            out->config = pcm_config_deep_buffer;

        } else {

            /* primary path is the default path selected if no other outputs are available/suitable */

            out->usecase = USECASE_AUDIO_PLAYBACK_PRIMARY;

hal/audio_hw.h

+2 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ typedef enum { 
    USECASE_AUDIO_PLAYBACK_LOW_LATENCY,

    USECASE_AUDIO_PLAYBACK_MULTI_CH,

    USECASE_AUDIO_PLAYBACK_OFFLOAD,

    USECASE_AUDIO_PLAYBACK_ULL,



#ifdef MULTIPLE_OFFLOAD_ENABLED

    USECASE_AUDIO_PLAYBACK_OFFLOAD2,

    USECASE_AUDIO_PLAYBACK_OFFLOAD3,
@@ -83,7 +85,6 @@ typedef enum { 


    /* FM usecase */

    USECASE_AUDIO_PLAYBACK_FM,

    USECASE_AUDIO_PLAYBACK_ULL,



    /* HFP Use case*/

    USECASE_AUDIO_HFP_SCO,

hal/msm8974/platform.c

+3 −3
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ static int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
                                        MULTIMEDIA2_PCM_DEVICE},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD] =

                     {PLAYBACK_OFFLOAD_DEVICE, PLAYBACK_OFFLOAD_DEVICE},

    [USECASE_AUDIO_PLAYBACK_ULL] = {MULTIMEDIA3_PCM_DEVICE,

                                    MULTIMEDIA3_PCM_DEVICE},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    [USECASE_AUDIO_PLAYBACK_OFFLOAD2] =

                     {PLAYBACK_OFFLOAD_DEVICE2, PLAYBACK_OFFLOAD_DEVICE2},
@@ -194,8 +196,6 @@ static int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_AUDIO_HFP_SCO] = {HFP_PCM_RX, HFP_SCO_RX},

    [USECASE_AUDIO_HFP_SCO_WB] = {HFP_PCM_RX, HFP_SCO_RX},

    [USECASE_VOICE_CALL] = {VOICE_CALL_PCM_DEVICE, VOICE_CALL_PCM_DEVICE},

    [USECASE_AUDIO_PLAYBACK_ULL] = {MULTIMEDIA3_PCM_DEVICE,

                                    MULTIMEDIA3_PCM_DEVICE},

    [USECASE_VOICE2_CALL] = {VOICE2_CALL_PCM_DEVICE, VOICE2_CALL_PCM_DEVICE},

    [USECASE_VOLTE_CALL] = {VOLTE_CALL_PCM_DEVICE, VOLTE_CALL_PCM_DEVICE},

    [USECASE_QCHAT_CALL] = {QCHAT_CALL_PCM_DEVICE, QCHAT_CALL_PCM_DEVICE},
@@ -477,6 +477,7 @@ static struct name_to_index usecase_name_index[AUDIO_USECASE_MAX] = { 
    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_LOW_LATENCY)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_MULTI_CH)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_ULL)},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD2)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD3)},
@@ -492,7 +493,6 @@ static struct name_to_index usecase_name_index[AUDIO_USECASE_MAX] = { 
#endif

#endif

    {TO_NAME_INDEX(USECASE_AUDIO_DIRECT_PCM_OFFLOAD)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_ULL)},

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD)},

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD_LOW_LATENCY)},

    {TO_NAME_INDEX(USECASE_VOICE_CALL)},

policy_hal/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_STATIC_LIBRARIES := \

    libmedia_helper \



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FORMATS)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FORMATS)),false)

LOCAL_CFLAGS += -DAUDIO_EXTN_FORMATS_ENABLED

endif
@@ -35,7 +35,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_SPK)),true) 
LOCAL_CFLAGS += -DAUDIO_EXTN_HDMI_SPK_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)

ifneq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),false)

LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED

endif