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

Commit 4a4a8c81 authored by Mingming Yin's avatar Mingming Yin
Browse files

policy_hal: add support for multiple offload playback 

- Add support for multiple offload playback.
- Do not check for reuse of current offload playback
  session if multiple offload feature is enabled.
- Remove multiple offload feature flag to enable
  compilation by default.

Change-Id: I91a8797ec5e260975ffd022d56bca01bc832da80
parent c7bc8490

hal/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ ifneq ($(strip $(DOLBY_DDP)),true) 
endif

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL)), true)

    LOCAL_CFLAGS += -DMULTIPLE_OFFLOAD_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)

    LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED

    LOCAL_CFLAGS += -DCOMPRESS_METADATA_NEEDED

hal/audio_hw.c

+0 −4
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_AUDIO_PLAYBACK_OFFLOAD] = "compress-offload-playback",

    //Enabled for Direct_PCM

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

#ifdef MULTIPLE_OFFLOAD_ENABLED

    [USECASE_AUDIO_PLAYBACK_OFFLOAD3] = "compress-offload-playback3",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD4] = "compress-offload-playback4",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD5] = "compress-offload-playback5",
@@ -178,7 +177,6 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_AUDIO_PLAYBACK_OFFLOAD7] = "compress-offload-playback7",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD8] = "compress-offload-playback8",

    [USECASE_AUDIO_PLAYBACK_OFFLOAD9] = "compress-offload-playback9",

#endif



    [USECASE_AUDIO_RECORD] = "audio-record",

    [USECASE_AUDIO_RECORD_COMPRESS] = "audio-record-compress",
@@ -215,7 +213,6 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
static const audio_usecase_t offload_usecases[] = {

    USECASE_AUDIO_PLAYBACK_OFFLOAD,

    USECASE_AUDIO_PLAYBACK_OFFLOAD2,

#ifdef MULTIPLE_OFFLOAD_ENABLED

    USECASE_AUDIO_PLAYBACK_OFFLOAD3,

    USECASE_AUDIO_PLAYBACK_OFFLOAD4,

    USECASE_AUDIO_PLAYBACK_OFFLOAD5,
@@ -223,7 +220,6 @@ static const audio_usecase_t offload_usecases[] = { 
    USECASE_AUDIO_PLAYBACK_OFFLOAD7,

    USECASE_AUDIO_PLAYBACK_OFFLOAD8,

    USECASE_AUDIO_PLAYBACK_OFFLOAD9,

#endif

};



#define STRING_TO_ENUM(string) { #string, string }

hal/audio_hw.h

+0 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ enum { 
    USECASE_AUDIO_PLAYBACK_MULTI_CH,

    USECASE_AUDIO_PLAYBACK_OFFLOAD,

    USECASE_AUDIO_PLAYBACK_OFFLOAD2,

#ifdef MULTIPLE_OFFLOAD_ENABLED

    USECASE_AUDIO_PLAYBACK_OFFLOAD3,

    USECASE_AUDIO_PLAYBACK_OFFLOAD4,

    USECASE_AUDIO_PLAYBACK_OFFLOAD5,
@@ -94,7 +93,6 @@ enum { 
    USECASE_AUDIO_PLAYBACK_OFFLOAD7,

    USECASE_AUDIO_PLAYBACK_OFFLOAD8,

    USECASE_AUDIO_PLAYBACK_OFFLOAD9,

#endif

    USECASE_AUDIO_PLAYBACK_ULL,



    /* FM usecase */

hal/msm8916/platform.c

+0 −4
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
                                        MULTIMEDIA2_PCM_DEVICE},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD] =

                     {PLAYBACK_OFFLOAD_DEVICE, PLAYBACK_OFFLOAD_DEVICE},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    /* 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.
@@ -281,7 +280,6 @@ int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [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},

    [USECASE_AUDIO_RECORD_LOW_LATENCY] = {LOWLATENCY_PCM_DEVICE,
@@ -657,7 +655,6 @@ 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)},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD2)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD3)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD4)},
@@ -666,7 +663,6 @@ static struct name_to_index usecase_name_index[AUDIO_USECASE_MAX] = { 
    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD7)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD8)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},

#endif

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD)},

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD_LOW_LATENCY)},

    {TO_NAME_INDEX(USECASE_VOICE_CALL)},

hal/msm8974/platform.c

+0 −4
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ static int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
                     {PLAYBACK_OFFLOAD_DEVICE, PLAYBACK_OFFLOAD_DEVICE},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD2] =

                     {PLAYBACK_OFFLOAD_DEVICE2, PLAYBACK_OFFLOAD_DEVICE2},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    [USECASE_AUDIO_PLAYBACK_OFFLOAD3] =

                     {PLAYBACK_OFFLOAD_DEVICE3, PLAYBACK_OFFLOAD_DEVICE3},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD4] =
@@ -274,7 +273,6 @@ static int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
                     {PLAYBACK_OFFLOAD_DEVICE8, PLAYBACK_OFFLOAD_DEVICE8},

    [USECASE_AUDIO_PLAYBACK_OFFLOAD9] =

                     {PLAYBACK_OFFLOAD_DEVICE9, PLAYBACK_OFFLOAD_DEVICE9},

#endif





    [USECASE_AUDIO_RECORD] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},
@@ -632,7 +630,6 @@ static struct name_to_index usecase_name_index[AUDIO_USECASE_MAX] = { 
    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_MULTI_CH)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD2)},

#ifdef MULTIPLE_OFFLOAD_ENABLED

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD3)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD4)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD5)},
@@ -640,7 +637,6 @@ static struct name_to_index usecase_name_index[AUDIO_USECASE_MAX] = { 
    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD7)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD8)},

    {TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},

#endif

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD)},

    {TO_NAME_INDEX(USECASE_AUDIO_RECORD_LOW_LATENCY)},

    {TO_NAME_INDEX(USECASE_VOICE_CALL)},