diff --git a/media/lahaina/media_codecs_lahaina.xml b/media/lahaina/media_codecs_lahaina.xml
index 0d7aa98fec1dceaa642b6a261d2ab44346b52893..e4cc2f4c4898146d0c42aceeca2a43c986889c13 100644
--- a/media/lahaina/media_codecs_lahaina.xml
+++ b/media/lahaina/media_codecs_lahaina.xml
@@ -106,6 +106,7 @@
<Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_vendor_audio.xml" />
<Include href="media_codecs_google_telephony.xml" />
+ <Include href="media_codecs_c2_audio.xml" />
<Settings>
<Setting name="max-video-encoder-input-buffers" value="11" />
</Settings>
@@ -270,6 +271,7 @@
<Limit name="block-count" range="64-138240" />
<Limit name="bitrate" range="1-220000000" />
<Limit name="frame-rate" range="1-960" />
+ <Limit name="complexity" range="0-100" default="100" />
<Limit name="concurrent-instances" max="16" />
<Feature name="bitrate-modes" value="VBR,CBR" />
<Feature name="intra-refresh" />
@@ -288,6 +290,7 @@
<Limit name="block-count" range="64-138240" />
<Limit name="bitrate" range="1-160000000" />
<Limit name="frame-rate" range="1-960" />
+ <Limit name="complexity" range="0-100" default="100" />
<Limit name="concurrent-instances" max="16" />
<Feature name="bitrate-modes" value="VBR,CBR" />
<Feature name="intra-refresh" />
@@ -305,6 +308,7 @@
<Limit name="blocks-per-second" min="64" max="3916800" />
<Limit name="bitrate" range="1-160000000" />
<Limit name="frame-rate" range="1-480" />
+ <Limit name="complexity" range="0-100" default="100" />
<Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
@@ -318,6 +322,7 @@
<Limit name="blocks-per-second" min="64" max="3916800" />
<Limit name="bitrate" range="1-160000000" />
<Limit name="frame-rate" range="1-20" />
+ <Limit name="complexity" range="0-100" default="100" />
<Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
diff --git a/media/lahaina/media_codecs_performance_lahaina.xml b/media/lahaina/media_codecs_performance_lahaina.xml
index 6434f7d59c6036adbe20caa6ba8a2b2226fbe54b..98fba142ea878e348584368865adc3e755cb53ae 100644
--- a/media/lahaina/media_codecs_performance_lahaina.xml
+++ b/media/lahaina/media_codecs_performance_lahaina.xml
@@ -131,7 +131,7 @@
<!-- measured 90%:42-420 med:146/160 FLAKY(mn=39.0 < 42 - 368 < mx=569.5) RG.VARIANCE:2.2 -->
<Limit name="measured-frame-rate-320x240" range="140-980" /> <!-- SHOULDN'T HAVE TWEAKED N=266 v90%=3.2 -->
<!-- measured 98%:29-166 med:66/63 FLAKY(24 - 166 < mx=166.5) variance:2.4 -->
- <Limit name="measured-frame-rate-720x480" range="47-83" /> <!-- N=262 -->
+ <Limit name="measured-frame-rate-720x480" range="125-176" /> <!-- N=262 -->
<!-- measured 98%:11-68 med:30/30 FLAKY(mn=10.5 < 11 - 68 < mx=82.1) variance:2.5 -->
<Limit name="measured-frame-rate-1280x720" range="30-200" /> <!-- TWEAKED N=236 -->
<!-- measured 98%:10-38 med:18/18 FLAKY(mn=5.2 < 9 - 38 < mx=38.8) -->
@@ -143,7 +143,7 @@
</MediaCodec>
<MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
<!-- measured 90%:6-36 med:30/29 FLAKY(mn=0.0 < 7 - 58) variance:2.5 -->
- <Limit name="measured-frame-rate-320x180" range="105-320" /> <!-- SHOULDN'T HAVE TWEAKED N=214 -->
+ <Limit name="measured-frame-rate-320x180" range="294-455" /> <!-- SHOULDN'T HAVE TWEAKED N=214 -->
<!-- measured 98%:3-24 med:12/12 FLAKY(mn=2.8 < 3 - 24 < mx=26.6) variance:2.8 -->
<Limit name="measured-frame-rate-640x360" range="75-350" /> <!-- N=220 -->
<!-- measured 98%:3-11 med:6/6 FLAKY(mn=0.0 < 3 - 12) -->
diff --git a/media/lahaina/media_profiles_lahaina.xml b/media/lahaina/media_profiles_lahaina.xml
index 80129f75facb28761f62e577abda18e20e9c3188..866bfc1eb004ee72d092db31399808a12447049e 100644
--- a/media/lahaina/media_profiles_lahaina.xml
+++ b/media/lahaina/media_profiles_lahaina.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2020 Qualcomm Technologies, Inc.
+ Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
@@ -192,45 +192,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="24" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -410,47 +371,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -830,45 +750,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="24" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -1048,47 +929,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -1270,45 +1110,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="24" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -1488,47 +1289,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -1710,45 +1470,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="24" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -1914,47 +1635,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="57500000"
- width="4096"
- height="2160"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="320000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
diff --git a/media/media_codecs_vendor_audio.xml b/media/media_codecs_vendor_audio.xml
index 2164a65e9c3ca408e14023925298bfc84ed9d10b..2749bc6b430b181822c3ef8b13347d9780148fea 100644
--- a/media/media_codecs_vendor_audio.xml
+++ b/media/media_codecs_vendor_audio.xml
@@ -18,7 +18,6 @@
<Included>
<Decoders>
<MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
- <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" update="true" rank="1"/>
<!-- SimpleOMXComponet based software decoder-->
</Decoders>
</Included>
diff --git a/media/shima/media_profiles_shima_v1.xml b/media/shima/media_profiles_shima_v1.xml
index b4ea07b8f7b6642a1278bfe616a1a7e6c86890f9..8b2ca5da4fc5722d2e2a24a5d1e3b06b27f635bc 100644
--- a/media/shima/media_profiles_shima_v1.xml
+++ b/media/shima/media_profiles_shima_v1.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2020 Qualcomm Technologies, Inc.
+ Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
All Rights Reserved.
Confidential and Proprietary - Qualcomm Technologies, Inc.
@@ -192,19 +192,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="50000000"
@@ -371,32 +358,17 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="30" />
- <!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
@@ -512,6 +484,19 @@
channels="2" />
</EncoderProfile>
+ <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="24" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
<Video codec="h264"
bitRate="192000"
@@ -665,6 +650,19 @@
channels="2" />
</EncoderProfile>
+ <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="30" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<ImageEncoding quality="95" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
@@ -765,30 +763,30 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="24" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
+ bitRate="50000000"
+ width="3840"
+ height="2160"
+ frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
@@ -944,32 +942,30 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="30" />
- <!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
+ bitRate="50000000"
+ width="3840"
+ height="2160"
+ frameRate="30" />
- <!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
@@ -1127,30 +1123,30 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="24" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
+ bitRate="50000000"
+ width="3840"
+ height="2160"
+ frameRate="30" />
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
@@ -1306,32 +1302,30 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
+ bitRate="57500000"
+ width="4096"
+ height="2160"
+ frameRate="30" />
- <!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
+ <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
+ bitRate="50000000"
+ width="3840"
+ height="2160"
+ frameRate="30" />
- <!-- audio setting is ignored -->
<Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
</EncoderProfile>
<EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
@@ -1489,32 +1483,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="57500000"
@@ -1693,34 +1661,6 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="29400000"
- width="2560"
- height="1440"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
- <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30">
- <Video codec="h264"
- bitRate="20000000"
- width="2048"
- height="1080"
- frameRate="30" />
-
- <!-- audio setting is ignored -->
- <Audio codec="aac"
- bitRate="156000"
- sampleRate="48000"
- channels="2" />
- </EncoderProfile>
-
<EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="57500000"
diff --git a/media/yupik/media_profiles_yupik_v1.xml b/media/yupik/media_profiles_yupik_v1.xml
index de28ba93866c865b0f9a82a5ca85b23c41603989..d470a2a3cf09b0d419b5e4a074690867cdbb6ff5 100644
--- a/media/yupik/media_profiles_yupik_v1.xml
+++ b/media/yupik/media_profiles_yupik_v1.xml
@@ -192,7 +192,7 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+ <!-- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="57500000"
width="4096"
@@ -203,7 +203,7 @@
bitRate="156000"
sampleRate="48000"
channels="2" />
- </EncoderProfile>
+ </EncoderProfile> -->
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
@@ -371,7 +371,7 @@
channels="2" />
</EncoderProfile>
- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+ <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="57500000"
width="4096"
@@ -382,7 +382,7 @@
bitRate="156000"
sampleRate="48000"
channels="2" />
- </EncoderProfile>
+ </EncoderProfile> -->
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"