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

Commit 96fafc01 authored by Bruno Martins's avatar Bruno Martins Committed by Bernhard Thoben
Browse files

kitakami-common: Restore audio tuning mixer control 

 * After all, this still seems to be needed for ACDB MCS init,
   as seen bellow. Just let ACDB loader be happy.

   Without the tuning mixer file:
     E ACDB-MCS: acdb_mcs_init: /vendor/etc/audio_tuning_mixer_tasha.txt not present, using /vendor/etc/audio_tuning_mixer.txt config file
     E MCS-RT-CTL: Can't open the configuration file /vendor/etc/audio_tuning_mixer.txt.
     E ACDB-MCS: acdb_mcs_init: MCS routing control initialization failed.

   With the tuning mixer file:
     E ACDB-MCS: acdb_mcs_init: /vendor/etc/audio_tuning_mixer_tasha.txt not present, using /vendor/etc/audio_tuning_mixer.txt config file
     D         : [ACPH]->MCS RTC service registered with ACPH

Change-Id: I6e4b1fe27547a354eaa4132aba8e3df04d6184b3
parent 9b666683

audio/audio_tuning_mixer.txt

0 → 100644
+171 −0
Original line number Original line Diff line number Diff line 
# Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved.

#

# Redistribution and use in source and binary forms, with or without

# modification, are permitted provided that the following conditions are

# met:

#    * Redistributions of source code must retain the above copyright

#      notice, this list of conditions and the following disclaimer.

#    * Redistributions in binary form must reproduce the above

#      copyright notice, this list of conditions and the following

#      disclaimer in the documentation and/or other materials provided

#      with the distribution.

#    * Neither the name of The Linux Foundation nor the names of its

#      contributors may be used to endorse or promote products derived

#      from this software without specific prior written permission.

#

# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



#ANC_TEST_P_PATH_MIC_STEREO Capture

acdb_dev_id:85

!Capture

Txdevice:0



enable

TX7 HPF Switch:1

TX8 HPF Switch:1

AIF1_CAP Mixer SLIM TX7:1

AIF1_CAP Mixer SLIM TX8:1

SLIM TX7 MUX:DEC9

DEC9 MUX:DMIC4

SLIM TX8 MUX:DEC10

DEC10 MUX:DMIC3

SLIM_0_TX Channels:Two

MultiMedia1 Mixer SLIM_0_TX:1



disable

MultiMedia1 Mixer SLIM_0_TX:0

AIF1_CAP Mixer SLIM TX7:0

AIF1_CAP Mixer SLIM TX8:0

SLIM TX7 MUX:ZERO

SLIM TX8 MUX:ZERO

DEC9 MUX:ZERO

DEC10 MUX:ZERO

TX7 HPF Switch:0

TX8 HPF Switch:0



#ANC_TEST_S_PATH_MIC_STEREO Capture

acdb_dev_id:88

!Capture

Txdevice:0



enable

TX7 HPF Switch:1

TX8 HPF Switch:1

AIF1_CAP Mixer SLIM TX7:1

AIF1_CAP Mixer SLIM TX8:1

SLIM TX7 MUX:DEC8

DEC7 MUX:ANC2_FB

ANC2 MUX:DMIC3

SLIM TX8 MUX:DEC7

DEC8 MUX:ANC1_FB

ANC1 MUX:DMIC3

ANC1 FB MUX:EAR_HPH_L

SLIM_0_TX Channels:Two

MultiMedia1 Mixer SLIM_0_TX:1



disable

MultiMedia1 Mixer SLIM_0_TX:0

AIF1_CAP Mixer SLIM TX7:0

AIF1_CAP Mixer SLIM TX8:0

SLIM TX7 MUX:ZERO

SLIM TX8 MUX:ZERO

DEC7 MUX:ZERO

ANC2 MUX:ZERO

ANC1 MUX:ZERO

DEC8 MUX:ZERO

ANC1 FB MUX:ZERO

TX7 HPF Switch:0

TX8 HPF Switch:0



#ANC_TEST_E_PATH_MIC_STEREO Capture

acdb_dev_id:91

!Capture

Txdevice:0



enable

TX7 HPF Switch:1

TX8 HPF Switch:1

AIF1_CAP Mixer SLIM TX7:1

AIF1_CAP Mixer SLIM TX8:1

SLIM TX7 MUX:DEC8

DEC7 MUX:ANC2_FB

ANC2 MUX:DMIC4

ANC1 MUX:DMIC4

SLIM TX8 MUX:DEC7

DEC8 MUX:ANC1_FB

ANC1 FB MUX:EAR_HPH_L

SLIM_0_TX Channels:Two

MultiMedia1 Mixer SLIM_0_TX:1



disable

MultiMedia1 Mixer SLIM_0_TX:0

AIF1_CAP Mixer SLIM TX7:0

AIF1_CAP Mixer SLIM TX8:0

SLIM TX7 MUX:ZERO

SLIM TX8 MUX:ZERO

DEC7 MUX:ZERO

ANC2 MUX:ZERO

DEC10 MUX:ZERO

ANC1 FB MUX:ZERO

TX7 HPF Switch:0

TX8 HPF Switch:0



#ANC_TEST_S_PATH_HANDSET_SPKR_ANC_MONO

acdb_dev_id:86

!Playback

Rxdevice:0



enable

ANC Function:ON

SLIM RX1 MUX:AIF1_PB

SLIM_0_RX Channels:One

RX1 MIX1 INP1:RX1

CLASS_H_DSM MUX:DSM_HPHL_RX1

RX1 Digital Volume:87

DAC1 Switch:1

ANC Slot:7

SLIMBUS_0_RX Audio Mixer MultiMedia1:1



disable

SLIMBUS_0_RX Audio Mixer MultiMedia1:0

ANC Slot:0

SLIM RX1 MUX:ZERO

RX1 MIX1 INP1:ZERO

RX1 Digital Volume:0

DAC1 Switch:0

ANC Function:OFF



#ANC_TEST_E_PATH_HANDSET_SPKR_ANC_MONO

acdb_dev_id:89

!Playback

Rxdevice:0



enable

ANC Function:ON

SLIM RX1 MUX:AIF1_PB

SLIM_0_RX Channels:One

RX1 MIX1 INP1:RX1

CLASS_H_DSM MUX:DSM_HPHL_RX1

RX1 Digital Volume:87

DAC1 Switch:1

ANC Slot:8

SLIMBUS_0_RX Audio Mixer MultiMedia1:1



disable

SLIMBUS_0_RX Audio Mixer MultiMedia1:0

ANC Slot:0

SLIM RX1 MUX:ZERO

RX1 MIX1 INP1:ZERO

RX1 Digital Volume:0

DAC1 Switch:0

ANC Function:OFF

device-common.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,8 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \

    $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \

    $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml

    $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt





PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \