Fix the high speed mode profile
R4 and O6 supports high speed mode on logical(0) and main(2) camera currently.
Since P21 only exposes rear logical camera, keep the high speed mode exposed
only on rear logical camera too.
Bug: 181600286
Test: CTS no regression
android.hardware.cts.CameraTest#testImmediateZoom FAIL
android.hardware.camera2.cts.CaptureRequestTest#testZoomRatio FAIL
Tests Passed: 181, Failed: 2, Not found: 0, Status unknown: 0
Signed-off-by: Peter Liu <pingchienliu@google.com>
Change-Id: I2a20596a83e3eb0a8a26bbc596aac6b7c25ff950
diff --git a/media_profiles_oriole.xml b/media_profiles_oriole.xml
index aff6517..a396302 100644
--- a/media_profiles_oriole.xml
+++ b/media_profiles_oriole.xml
@@ -408,20 +408,6 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
- <Video codec="h264"
- bitRate="42000000"
- width="1920"
- height="1080"
- 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" />
@@ -539,20 +525,6 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
- <Video codec="h264"
- bitRate="42000000"
- width="1920"
- height="1080"
- frameRate="120" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="96000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
<ImageEncoding quality="90" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
diff --git a/media_profiles_raven.xml b/media_profiles_raven.xml
index 909db37..dd0b2e9 100644
--- a/media_profiles_raven.xml
+++ b/media_profiles_raven.xml
@@ -408,20 +408,6 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
- <Video codec="h264"
- bitRate="42000000"
- width="1920"
- height="1080"
- 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" />
@@ -539,20 +525,6 @@
channels="1" />
</EncoderProfile>
- <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
- <Video codec="h264"
- bitRate="42000000"
- width="1920"
- height="1080"
- frameRate="120" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="96000"
- sampleRate="48000"
- channels="1" />
- </EncoderProfile>
-
<ImageEncoding quality="90" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />