From cf40ac3383babbaeda6d96bf45a702affab33f44 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Fri, 21 Jul 2023 10:37:34 +0800 Subject: [PATCH 1/3] Add broadcast capabilities to support 48_4 & 48_2 Bug: 292538449 Test: broadcast streaming via offload path. Change-Id: I325f2ab083442acd7ff8994b463781d0e5971052 --- bluetooth/le_audio_codec_capabilities.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index 9dcdd01..f277589 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -47,6 +47,8 @@ + + @@ -65,6 +67,8 @@ + + @@ -73,6 +77,7 @@ + From d28196ccc3a4822e3ec584f5e18f36c0d26b02d9 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 12 Jul 2023 11:28:40 -0700 Subject: [PATCH 2/3] thermal: add CPU policy for camera mode Disable VIRTUAL-SKIN-CPU-HIGH for camera mode Bug: 290225694 Test: run camcorder Change-Id: I175f95df41cd72e1075dc19be488642ad5e3f073 --- perf/powerhint-husky.json | 29 +++++++++++++++++++++++--- perf/powerhint-shiba.json | 29 +++++++++++++++++++++++--- thermal/thermal_info_config_husky.json | 26 ++++++++++++++++++++--- thermal/thermal_info_config_shiba.json | 20 ++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index d288d84..45053cd 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -754,18 +754,23 @@ "Name": "VIRTUAL-SKIN-CPU-MID", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", "Values": [ - "game", - "" + "", + "game" ], + "DefaultIndex": 0, + "ResetOnInit": true, "Type": "Property" }, { "Name": "VIRTUAL-SKIN-CPU-HIGH", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile", "Values": [ + "", "game", - "" + "camera" ], + "DefaultIndex": 0, + "ResetOnInit": true, "Type": "Property" }, { @@ -1519,6 +1524,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1663,6 +1674,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1789,6 +1806,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index be39284..51beaab 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -754,18 +754,23 @@ "Name": "VIRTUAL-SKIN-CPU-MID", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", "Values": [ - "game", - "" + "", + "game" ], + "DefaultIndex": 0, + "ResetOnInit": true, "Type": "Property" }, { "Name": "VIRTUAL-SKIN-CPU-HIGH", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile", "Values": [ + "", "game", - "" + "camera" ], + "DefaultIndex": 0, + "ResetOnInit": true, "Type": "Property" }, { @@ -1417,6 +1422,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1561,6 +1572,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1687,6 +1704,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "VIRTUAL-SKIN-CPU-HIGH", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 86e317e..f69738f 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -531,17 +531,37 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, - "Disabled":true + "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, - "Disabled":true + "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, - "Disabled":true + "Disabled":true + } + ] + }, + { + "Mode": "camera", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "MaxReleaseStep": 1, + "Disabled":true } ] } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 2e37654..9c71dbe 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -512,6 +512,26 @@ "Disabled":true } ] + }, + { + "Mode": "camera", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] } ] }, From ea872f817267acb9cb323093f6dc2d66c88f7cd1 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 21 Jul 2023 09:47:01 +0800 Subject: [PATCH 3/3] audio: adding HDMI to all policy configurations Bug: 264508873 Test: build pass Change-Id: I3a55089732bee260817ea28874a92d8ae5b9b4f3 Signed-off-by: Carter Hsu --- .../audio_policy_configuration_a2dp_offload_disabled.xml | 4 +++- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 4 +++- .../config/audio_policy_configuration_le_offload_disabled.xml | 4 +++- .../audio_policy_configuration_a2dp_offload_disabled.xml | 4 +++- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 4 +++- .../config/audio_policy_configuration_le_offload_disabled.xml | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml index 78b7ee8..4878bc5 100644 --- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -149,7 +149,7 @@ - + @@ -184,6 +184,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -180,6 +180,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/> + - + @@ -205,6 +205,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -184,6 +184,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -180,6 +180,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/> + - + @@ -205,6 +205,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> +