From 27eabda6dd417619e414f750c8eb8cb78ac72999 Mon Sep 17 00:00:00 2001
From: pointerkung <pointerkung@google.com>
Date: Wed, 6 Jul 2022 17:33:49 +0800
Subject: [PATCH 1/2] Camera: Update target load for high streaming case

Update target load due to Pro mid CPU
this hint impact the high streaming use case like 60fps / 120fps and
240fps.

Bug: 238166810
Test: build pass and camera preview
Change-Id: Icd593f8b9b87345947e65271f4cbf03cc47bdcae
---
 powerhint.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 99a2355..5f2c9de 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -126,7 +126,8 @@
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
         "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "80 10 80"
       ],
       "ResetOnInit": true
     },
@@ -719,7 +720,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -797,7 +798,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",

From 41955b5aab4f3785056a857737ec236c8a60acc8 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Fri, 8 Jul 2022 17:33:47 +0800
Subject: [PATCH 2/2] audio: update mixer_paths_factory.xml to fix USB loopback
 issue

Bug: 238280857
Test: verified by audio tool commands
Change-Id: I2fe137f8fc922d71de1711ebecab3f294dc552d8
---
 audio/felix/config/mixer_paths_factory.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/audio/felix/config/mixer_paths_factory.xml b/audio/felix/config/mixer_paths_factory.xml
index 1a44ee1..3438bcf 100644
--- a/audio/felix/config/mixer_paths_factory.xml
+++ b/audio/felix/config/mixer_paths_factory.xml
@@ -34,6 +34,7 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
@@ -283,6 +284,7 @@
 
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
+        <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback EP ID v2" value="1" />
         <ctl name="USB Playback FORMAT v2" value="6" />
         <ctl name="USB Playback SR v2" value="48000" />