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

Commit 5060ca91 authored by Carter Hsu's avatar Carter Hsu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b1c1-WAVES-effect" into pi-dev 

* changes:
  audio: porting MAXXAUDIO
  audio: Add API to set audio calibration
parents 8221fc17 270b7762

hal/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -183,10 +183,16 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SND_MONITOR)), true) 
    LOCAL_SRC_FILES += audio_extn/sndmonitor.c

endif





ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USB_SERVICE_INTERVAL)), true)

    LOCAL_CFLAGS += -DUSB_SERVICE_INTERVAL_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MAXX_AUDIO)), true)

    LOCAL_CFLAGS += -DMAXXAUDIO_QDSP_ENABLED

    LOCAL_SRC_FILES += audio_extn/maxxaudio.c

endif



LOCAL_SHARED_LIBRARIES += libbase libhidlbase libhwbinder libutils android.hardware.power@1.2 liblog



LOCAL_SRC_FILES += audio_perf.cpp

hal/acdb.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ typedef void (*acdb_send_voice_cal_t)(int, int); 
typedef int (*acdb_reload_vocvoltable_t)(int);

typedef int (*acdb_send_gain_dep_cal_t)(int, int, int, int, int);

typedef int (*acdb_send_custom_top_t) (void);

typedef int (*acdb_set_audio_cal_t) (void *, void *, uint32_t);



struct meta_key_list {

    struct listnode list;

hal/audio_extn/maxxaudio.c

0 → 100644
+627 −0

File added.

Preview size limit exceeded, changes collapsed.

hal/audio_extn/maxxaudio.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef MAXXAUDIO_H_

#define MAXXAUDIO_H_



#ifndef MAXXAUDIO_QDSP_ENABLED

#define audio_extn_ma_init(platform)                                      (0)

#define audio_extn_ma_deinit()                                            (0)

#define audio_extn_ma_set_state(adev, type, vol, active)                  (false)

#define audio_extn_ma_set_device(adev, usecase)                           (0)

#define audio_extn_ma_set_parameters(adev, param)                         (0)

#define audio_extn_ma_supported_usb()                                     (false)

#else

void audio_extn_ma_init(void *platform);

void audio_extn_ma_deinit();

bool audio_extn_ma_set_state(struct audio_device *adev, int stream_type, float vol, bool active);

void audio_extn_ma_set_device(struct audio_device *adev, struct audio_usecase *usecase);

void audio_extn_ma_set_parameters(struct audio_device *adev, struct str_parms *parms);

bool audio_extn_ma_supported_usb();

#endif /* MAXXAUDIO_QDSP_ENABLED */



#endif /* MAXXAUDIO_H_ */

hal/audio_hw.c

+32 −1

File changed.

Preview size limit exceeded, changes collapsed.