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

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

Merge "hal: add ip-handler audio extension module"

parents 2b3e0735 e7156034

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ AM_CONDITIONAL([KEEP_ALIVE], [test x$AUDIO_FEATURE_ENABLED_KEEP_ALIVE = xtrue]) 
AM_CONDITIONAL([GEF], [test x$AUDIO_FEATURE_ENABLED_GEF_SUPPORT = xtrue])

AM_CONDITIONAL([APTX_DECODER], [test x$AUDIO_FEATURE_ENABLED_APTX_DECODER = xtrue])

AM_CONDITIONAL([ADSP_HDLR], [test x$AUDIO_FEATURE_ADSP_HDLR_ENABLED = xtrue])

AM_CONDITIONAL([AUDIO_IP_HDLR], [test x$AUDIO_FEATURE_IP_HDLR_ENABLED = xtrue])

AM_CONDITIONAL([SPLIT_A2DP], [test x$AUDIO_FEATURE_ENABLED_SPLIT_A2DP = xtrue])



AC_CONFIG_FILES([ \

hal/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -358,6 +358,11 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DYNAMIC_LOG)), true) 
    LOCAL_SHARED_LIBRARIES += libaudio_log_utils

endif



ifeq ($(strip $($AUDIO_FEATURE_IP_HDLR_ENABLED)),true)

    LOCAL_CFLAGS += -DAUDIO_EXTN_IP_HDLR_ENABLED

    LOCAL_SRC_FILES += audio_extn/ip_hdlr_intf.c

endif



LOCAL_CFLAGS += -Wall -Werror



LOCAL_COPY_HEADERS_TO   := mm-audio

hal/Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ AM_CFLAGS += -DSPLIT_A2DP_ENABLED 
c_sources += audio_extn/a2dp.c

endif



if AUDIO_IP_HDLR

AM_CFLAGS += -DAUDIO_EXTN_IP_HDLR_ENABLED

c_sources += audio_extn/ip_hdlr_intf.c

endif



h_sources = audio_extn/audio_defs.h \

            audio_extn/audio_extn.h \

            audio_hw.h \

hal/audio_extn/adsp_hdlr.c

+302 −227

File changed.

Preview size limit exceeded, changes collapsed.

hal/audio_extn/adsp_hdlr.h

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ struct adsp_hdlr_stream_cfg { 
};



#ifdef AUDIO_EXTN_ADSP_HDLR_ENABLED



typedef int (*adsp_event_callback_t)(void *handle, void *payload, void *cookie);



int audio_extn_adsp_hdlr_init(struct mixer *mixer);

int audio_extn_adsp_hdlr_deinit(void);

int audio_extn_adsp_hdlr_stream_open(void **handle,
@@ -53,6 +56,9 @@ int audio_extn_adsp_hdlr_stream_set_callback(void *handle, 
int audio_extn_adsp_hdlr_stream_set_param(void *handle,

                    adsp_hdlr_cmd_t cmd,

                    void *param);

int audio_extn_adsp_hdlr_stream_register_event(void *handle,

                void *param, adsp_event_callback_t cb, void *cookie);

int audio_extn_adsp_hdlr_stream_deregister_event(void *handle, void *param);

#else

#define audio_extn_adsp_hdlr_init(mixer)                                     (0)

#define audio_extn_adsp_hdlr_deinit()                                        (0)
@@ -60,6 +66,8 @@ int audio_extn_adsp_hdlr_stream_set_param(void *handle, 
#define audio_extn_adsp_hdlr_stream_close(handle)                            (0)

#define audio_extn_adsp_hdlr_stream_set_callback(handle, callback, cookie)   (0)

#define audio_extn_adsp_hdlr_stream_set_param(handle, cmd, param)            (0)

#define audio_extn_adsp_hdlr_stream_register_event(stream_data, param, cb)   (0)

#define audio_extn_adsp_hdlr_stream_deregister_event(handle, param)          (0)

#endif



#endif