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

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

Merge "frameworks/av: Add support for DSD offload playback." into av-aosp.lnx.2.0-dev

parents 2e9400f6 f1138c9c

services/audiopolicy/common/managerdefinitions/Android.mk

+2 −14
Original line number Diff line number Diff line
@@ -35,20 +35,8 @@ LOCAL_C_INCLUDES := \ 
    $(TOPDIR)frameworks/av/services/audiopolicy/utilities \



ifeq ($(call is-vendor-board-platform,QCOM),true)

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true)

LOCAL_CFLAGS     += -DFLAC_OFFLOAD_ENABLED

endif

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_WMA_OFFLOAD)),true)

LOCAL_CFLAGS     += -DWMA_OFFLOAD_ENABLED

endif

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD)),true)

LOCAL_CFLAGS     += -DALAC_OFFLOAD_ENABLED

endif

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_APE_OFFLOAD)),true)

LOCAL_CFLAGS     += -DAPE_OFFLOAD_ENABLED

endif

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD)),true)

LOCAL_CFLAGS     += -DAAC_ADTS_OFFLOAD_ENABLED

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

LOCAL_CFLAGS     += -DAUDIO_EXTN_FORMATS_ENABLED

endif

endif

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp

+2 −9
Original line number Diff line number Diff line
@@ -147,20 +147,12 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS_HD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_IEC61937),

#ifdef FLAC_OFFLOAD_ENABLED

#ifdef AUDIO_EXTN_FORMATS_ENABLED

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_FLAC),

#endif

#ifdef WMA_OFFLOAD_ENABLED

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_WMA),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_WMA_PRO),

#endif

#ifdef ALAC_OFFLOAD_ENABLED

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_ALAC),

#endif

#ifdef APE_OFFLOAD_ENABLED

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APE),

#endif

#ifdef AAC_ADTS_OFFLOAD_ENABLED

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_MAIN),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_SSR),
@@ -171,6 +163,7 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_HE_V2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_ELD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DSD),

#endif

};

template<>