From 75519032c87225b1c5784644748d1e6f34aa74db Mon Sep 17 00:00:00 2001
From: Erik Cheng <erikcheng@google.com>
Date: Wed, 28 Dec 2022 19:13:31 +0800
Subject: [PATCH 1/3] camera hfr: add 720 high speed profile for immersive crop

Bug: 246904793
Test: GCA
Change-Id: I0b00041af9e0a1dcab97471d84b2b2917df9f399
---
 media_profiles_felix.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/media_profiles_felix.xml b/media_profiles_felix.xml
index fe38eee..baf8de1 100644
--- a/media_profiles_felix.xml
+++ b/media_profiles_felix.xml
@@ -256,9 +256,9 @@
 
         <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="72000000"
-                   width="1920"
-                   height="1080"
+                   bitRate="42000000"
+                   width="1280"
+                   height="720"
                    frameRate="240" />
 
             <!-- audio setting is ignored -->
@@ -296,6 +296,20 @@
                    channels="1" />
         </EncoderProfile>
 
+        <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="60">
+            <Video codec="h264"
+                   bitRate="42000000"
+                   width="1280"
+                   height="720"
+                   frameRate="240" />
+
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />

From f19351f3a9a0eecbe27240d960821ce5a6b9cfe6 Mon Sep 17 00:00:00 2001
From: Chase Wu <chasewu@google.com>
Date: Tue, 3 Jan 2023 15:38:11 +0800
Subject: [PATCH 2/3] [DO NOT MERGE] cs40l26: Report the duration time when
 using DOUBLE_CLICK effect

DOUBLE_CLICK is a composed effect, but it uses another function to
do the composed process.
When using GPI to trigger a composed effect, HAL needs to update the
overall duration time to chip.

Bug: 263963724
Test: Manully unlock the device
Change-Id: I329fbeff69a56fe990b1ca946bdd30199048ef04
---
 vibrator/cs40l26/Vibrator.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp
index 0716517..0b26730 100644
--- a/vibrator/cs40l26/Vibrator.cpp
+++ b/vibrator/cs40l26/Vibrator.cpp
@@ -1508,6 +1508,10 @@ ndk::ScopedAStatus Vibrator::getCompoundDetails(Effect effect, EffectStrength st
     }
 
     *outTimeMs = timeMs;
+    mFfEffects[WAVEFORM_COMPOSE].replay.length = static_cast<uint16_t>(timeMs);
+    if (mIsDual) {
+        mFfEffectsDual[WAVEFORM_COMPOSE].replay.length = static_cast<uint16_t>(timeMs);
+    }
 
     return ndk::ScopedAStatus::ok();
 }

From 900683d3b01106f9926d95a57d001edb0059e02e Mon Sep 17 00:00:00 2001
From: millerliang <millerliang@google.com>
Date: Wed, 4 Jan 2023 16:08:47 +0800
Subject: [PATCH 3/3] audio: change the EP for spatial audio

Bug: 260779305
Test: manual test
Signed-off-by: millerliang <millerliang@google.com>
Change-Id: Ib56d5727788ed56b3a7e4d0d184a615813456f17
---
 audio/felix/config/mixer_paths.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml
index 6971920..0b7f681 100644
--- a/audio/felix/config/mixer_paths.xml
+++ b/audio/felix/config/mixer_paths.xml
@@ -458,11 +458,11 @@
     </path>
 
     <path name="immersive-playbackP bt">
-        <ctl name="BT_RX Mixer IMSV" value="1"/>
+        <ctl name="BT_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="immersive-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer IMSV" value="1"/>
+        <ctl name="USB_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="voip-playbackP">