From a3e2652c864ac46e0f84a7805768750992a4f2c8 Mon Sep 17 00:00:00 2001 From: yixuanjiang Date: Tue, 31 May 2022 11:07:00 +0800 Subject: [PATCH 1/4] audio: enable stereo AAC encoder Test: local test pass Bug: 227212413 Signed-off-by: yixuanjiang Change-Id: Ibe27d6ba38f1d349c032194c575a311a923196e4 --- media_profiles_cheetah.xml | 6 +++--- media_profiles_panther.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media_profiles_cheetah.xml b/media_profiles_cheetah.xml index ee7a033..ec2be61 100644 --- a/media_profiles_cheetah.xml +++ b/media_profiles_cheetah.xml @@ -1761,17 +1761,17 @@ + minChannels="1" maxChannels="2" /> + minChannels="1" maxChannels="2" /> + minChannels="1" maxChannels="2" /> + minChannels="1" maxChannels="2" /> + minChannels="1" maxChannels="2" /> + minChannels="1" maxChannels="2" /> Date: Tue, 24 May 2022 10:32:31 +0000 Subject: [PATCH 2/4] audio: enable mmap playback and record on BT AoC can support mmap on BT both playback and recording after gpar/322484. Bug: 232205959 Test: Play MMAP games and OboeTester Change-Id: Id696b578f4a2e3f94d6193e714b6d9f1ace6977a --- .../config/audio_policy_configuration.xml | 20 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...icy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- ...licy_configuration_le_offload_disabled.xml | 16 +++++++-------- audio/cheetah/config/mixer_paths.xml | 17 ++++++++++++++++ .../config/audio_policy_configuration.xml | 20 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...icy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- ...licy_configuration_le_offload_disabled.xml | 16 +++++++-------- audio/panther/config/mixer_paths.xml | 17 ++++++++++++++++ 10 files changed, 90 insertions(+), 56 deletions(-) diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index 2e15f64..692704e 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -204,25 +204,25 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -233,9 +233,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/> diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml index dc916ea..e5fbc7c 100644 --- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 484048f..92d97af 100644 --- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml index 612295c..573098e 100644 --- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml @@ -192,21 +192,21 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -217,9 +217,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index 33ac476..b1bad77 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -159,6 +159,7 @@ + @@ -396,6 +397,10 @@ + + + + @@ -407,6 +412,10 @@ + + + + @@ -604,6 +613,10 @@ + + + + @@ -612,6 +625,10 @@ + + + + > diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml index 2e15f64..692704e 100644 --- a/audio/panther/config/audio_policy_configuration.xml +++ b/audio/panther/config/audio_policy_configuration.xml @@ -204,25 +204,25 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -233,9 +233,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/> diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml index dc916ea..e5fbc7c 100644 --- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 484048f..92d97af 100644 --- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml index 612295c..573098e 100644 --- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml @@ -192,21 +192,21 @@ + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/> @@ -217,9 +217,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index 33ac476..b1bad77 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -159,6 +159,7 @@ + @@ -396,6 +397,10 @@ + + + + @@ -407,6 +412,10 @@ + + + + @@ -604,6 +613,10 @@ + + + + @@ -612,6 +625,10 @@ + + + + > From 3537df9211fae9f02b1bafd08b75dc4930cc9d48 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 26 May 2022 17:53:33 +0800 Subject: [PATCH 3/4] Change padding and height radio for keyboard Bug: 219397352 Change-Id: Idbecefe6c73966764679dc545dff58dfd220e9e3 --- device-cheetah.mk | 7 +++++++ device-panther.mk | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index b15b03c..27648a8 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -285,3 +285,10 @@ else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=94 endif + +# Keyboard bottom and side padding in dp for portrait mode and height ratio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.com.google.ime.kb_pad_port_b=8 \ + ro.com.google.ime.kb_pad_port_l=11 \ + ro.com.google.ime.kb_pad_port_r=11 \ + ro.com.google.ime.height_ratio=1.025 diff --git a/device-panther.mk b/device-panther.mk index 9fd7289..652437f 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -272,3 +272,8 @@ else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=94 endif + +# Keyboard bottom padding in dp for portrait mode and height ratio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.com.google.ime.kb_pad_port_b=8 \ + ro.com.google.ime.height_ratio=1.075 From 4bf5bce6ad3093904a661ee38922149c62f82f2e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 25 May 2022 13:32:50 +0800 Subject: [PATCH 4/4] thermal: add k_i for CPU GPU PID loop Bug: 232919952 Test: run manhattan and burn8 Change-Id: I8b0e59b0b32a19b49116240ff01145f9a950ffb6 --- thermal_info_config_cheetah.json | 9 +++++---- thermal_info_config_panther.json | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 6547d12..3f2410d 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -164,14 +164,15 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1500, 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"], - "E_Integral_Default": 50 + "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"], + "I_Default": 1000, + "TranCycle": 5 }, "BindedCdevInfo": [ { diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 12e040c..670c283 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -156,22 +156,23 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], "Coefficient":[1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1500, 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"], - "E_Integral_Default": 50 + "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"], + "I_Default": 1000, + "TranCycle": 5 }, "BindedCdevInfo": [ {