Snap for 8573193 from f287279041 to tm-qpr1-release

Change-Id: I80f3576837b5d2413e5954162c5088b0b379e7a8
This commit is contained in:
Android Build Coastguard Worker 2022-05-12 03:01:15 +00:00
commit 46d6874c89
16 changed files with 168 additions and 18 deletions

View file

@ -196,7 +196,7 @@
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
<!-- for hifi -->
<usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
<usecase id="UC_HIFI_RECORD" dev1="26"/>
@ -286,7 +286,7 @@
<external_module>
<module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>

View file

@ -731,7 +731,7 @@
</path>
<path name="speaker-mic-post">
<ctl name="MIC Record Soft Gain (dB)" value="0"/>
<ctl name="MIC Record Soft Gain (dB)" value="22"/>
</path>
<path name="voice-speaker-mic">

View file

@ -5,7 +5,7 @@
# Putting any value other than 1 would be equivalent to not supported.
########################################################################################################
[HAL_SUPPORTED_FEATURES]
CUSTOM_ACTION_258=1
CUSTOM_ACTION_256=1
########################################################################################################
# This defined the options of supported sample rates.
@ -26,9 +26,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
# This should be configured by Waves only unless platform vendor is familiar with MPS structure.
########################################################################################################
[HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
@ -40,7 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
# This can be configured by Waves or platform vendor.
########################################################################################################
[HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
@ -55,10 +52,7 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatSampleSize=4
#AudioFormatIncrement=8
[CUSTOM_ACTION_258]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
[CUSTOM_ACTION_256]
CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC

View file

@ -196,7 +196,7 @@
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
<!-- for hifi -->
<usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
<usecase id="UC_HIFI_RECORD" dev1="26"/>
@ -286,7 +286,7 @@
<external_module>
<module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>

View file

@ -731,7 +731,7 @@
</path>
<path name="speaker-mic-post">
<ctl name="MIC Record Soft Gain (dB)" value="0"/>
<ctl name="MIC Record Soft Gain (dB)" value="22"/>
</path>
<path name="voice-speaker-mic">

View file

@ -67,6 +67,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/pantah/media_profiles_cheetah.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
# Media Performance Class 13
PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=33
# Display Config
PRODUCT_COPY_FILES += \
device/google/pantah/cheetah/display_colordata_boe-nt37290_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_boe-nt37290_cal0.pb \

View file

@ -57,6 +57,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/pantah/media_profiles_panther.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
# Media Performance Class 13
PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=33
# Display Config
PRODUCT_COPY_FILES += \
device/google/pantah/panther/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb

View file

@ -256,6 +256,15 @@
],
"ResetOnInit": true
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "DisplayWakeup",
"Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@ -539,6 +548,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -587,6 +602,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
@ -605,6 +626,12 @@
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "NPITaskPacking",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",

View file

@ -255,6 +255,15 @@
],
"ResetOnInit": true
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "DisplayWakeup",
"Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@ -538,6 +547,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -586,6 +601,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
@ -604,6 +625,12 @@
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "NPITaskPacking",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",

View file

@ -213,6 +213,15 @@
],
"ResetOnInit": true
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "DisplayWakeup",
"Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@ -396,6 +405,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -444,6 +459,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",

View file

@ -255,6 +255,15 @@
],
"ResetOnInit": true
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "DisplayWakeup",
"Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@ -527,6 +536,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -575,6 +590,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
@ -593,6 +614,12 @@
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "NPITaskPacking",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",

View file

@ -254,6 +254,15 @@
],
"ResetOnInit": true
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"Name": "DisplayWakeup",
"Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@ -526,6 +535,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -574,6 +589,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "CPUBigClusterMaxFreq",
@ -592,6 +613,12 @@
"Duration": 2000,
"Value": "9999999"
},
{
"PowerHint": "CAMERA_LAUNCH_EXTENDED",
"Node": "NPITaskPacking",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",

View file

@ -396,6 +396,12 @@
"Duration": 5000,
"Value": "3172000"
},
{
"PowerHint": "LAUNCH",
"Node": "NPITaskPacking",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "MemFreq",
@ -444,6 +450,12 @@
"Duration": 1000,
"Value": "4-7"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "NPITaskPacking",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
"Node": "CPUBigClusterMaxFreq",
@ -654,6 +666,15 @@
"Duration": 0,
"Value": "1"
},
{
"Name": "NPITaskPacking",
"Path": "/proc/vendor_sched/npi_packing",
"Values": [
"0",
"1"
],
"ResetOnInit": true
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "GPUMinFreq",