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

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

Merge "hal: Fix bit width for 24 bit PCM offload playback"

parents b91559ab c1d39c98

hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true) 
    LOCAL_CFLAGS += -DQTI_FLAC_DECODER

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24)),true)

       LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED_24

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DEV_ARBI)),true)

    LOCAL_CFLAGS += -DDEV_ARBI_ENABLED

    LOCAL_SRC_FILES += audio_extn/dev_arbi.c

hal/audio_extn/audio_extn.h

+5 −2
Original line number Diff line number Diff line
@@ -75,9 +75,12 @@ 
#define AUDIO_OFFLOAD_CODEC_FLAC_MAX_BLK_SIZE "music_offload_flac_max_blk_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MIN_FRAME_SIZE "music_offload_flac_min_frame_size"

#define AUDIO_OFFLOAD_CODEC_FLAC_MAX_FRAME_SIZE "music_offload_flac_max_frame_size"

#define PCM_OUTPUT_BIT_WIDTH (CODEC_BACKEND_DEFAULT_BIT_WIDTH)

#else

#endif



#ifdef PCM_OFFLOAD_ENABLED_24

#define PCM_OUTPUT_BIT_WIDTH (config->offload_info.bit_width)

#else

#define PCM_OUTPUT_BIT_WIDTH (CODEC_BACKEND_DEFAULT_BIT_WIDTH)

#endif



#define MAX_LENGTH_MIXER_CONTROL_IN_INT                  (128)