sm8350-common: media: Sync media configs from haydn V14.0.3.0.TKKMIXM

Change-Id: Id00ae3eb328ceac73e65349b3abc97fb8ffef75f
2023-01-22 15:53:43 +01:00 · 2023-01-22 15:53:43 +01:00 · dcfd80bbdf
commit dcfd80bbdf
parent 6c44bff5f7
5 changed files with 31 additions and 41 deletions
--- a/media/shima/media_codecs_performance_shima_v1.xml
+++ b/media/shima/media_codecs_performance_shima_v1.xml
@ -92,6 +92,8 @@
        </MediaCodec>
        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="408-888" />
+            <Limit name="measured-frame-rate-480x360" range="1260-1600" />
+            <Limit name="measured-frame-rate-1280x720" range="230-560" />
        </MediaCodec>
    </Decoders>

--- a/media/shima/media_codecs_shima_v1.xml
+++ b/media/shima/media_codecs_shima_v1.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-    Copyright (c) 2018-2020 Qualcomm Technologies, Inc.
+    Copyright (c) 2018-2021 Qualcomm Technologies, Inc.
    All Rights Reserved.
    Confidential and Proprietary - Qualcomm Technologies, Inc.

@ -102,6 +102,7 @@
            <Limit name="frame-rate" range="1-480" />
            <Limit name="concurrent-instances" max="16" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="performance-point-4096x2304" value="30" />
            <Limit name="performance-point-3840x2160" value="60" />
            <Limit name="performance-point-1920x1080" value="240" />
@ -118,6 +119,7 @@
            <Limit name="frame-rate" range="1-480" />
            <Limit name="concurrent-instances" max="16" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Feature name="low-latency" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-4096x2304" value="30" />
@ -135,6 +137,7 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Feature name="secure-playback" required="true" />
            <Feature name="low-latency" />
            <Limit name="concurrent-instances" max="3" />
@ -151,6 +154,7 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-480" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-4096x2304" value="30" />
            <Limit name="performance-point-3840x2160" value="60" />
@ -167,6 +171,7 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-480" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Feature name="low-latency" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-4096x2304" value="30" />
@ -184,6 +189,7 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Feature name="secure-playback" required="true" />
            <Feature name="low-latency" />
            <Limit name="concurrent-instances" max="3" />
@ -200,6 +206,7 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-4096x2304" value="30" />
            <Limit name="performance-point-3840x2160" value="60" />
@ -214,6 +221,7 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Feature name="secure-playback" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-4096x2304" value="30" />
@ -229,6 +237,7 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="frame-rate" range="1-30" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-1920x1080" value="30" />
        </MediaCodec>
@ -245,6 +254,9 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-480" />
            <Limit name="concurrent-instances" max="16" />
+            <Feature name="intra-refresh" />
+            <Feature name="can-swap-width-height" required="true" />
+            <Feature name="bitrate-modes" value="VBR,CBR" />
            <Limit name="performance-point-4096x2304" value="30" />
            <Limit name="performance-point-3840x2160" value="60" />
            <Limit name="performance-point-1920x1080" value="240" />
@ -261,6 +273,8 @@
            <Limit name="frame-rate" range="1-480" />
            <Limit name="concurrent-instances" max="16" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="intra-refresh" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="performance-point-4096x2304" value="30" />
            <Limit name="performance-point-3840x2160" value="60" />
            <Limit name="performance-point-1920x1080" value="240" />
--- a/media/shima/media_profiles_shima_v1.xml
+++ b/media/shima/media_profiles_shima_v1.xml
@ -358,19 +358,6 @@
             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>
-
    <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
      <Video codec="h264"
            bitRate="50000000"
@ -484,19 +471,6 @@
             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"
@ -650,19 +624,6 @@
             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" />
--- a/media/yupik/media_codecs_performance_yupik_v1.xml
+++ b/media/yupik/media_codecs_performance_yupik_v1.xml
@ -92,6 +92,8 @@
        </MediaCodec>
        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
            <Limit name="measured-frame-rate-176x144" range="730-1470" />
+            <Limit name="measured-frame-rate-480x360" range="1260-1600" />
+            <Limit name="measured-frame-rate-1280x720" range="230-560" />
        </MediaCodec>
    </Decoders>

@ -132,7 +134,7 @@
            <Limit name="measured-frame-rate-176x144" range="315-379" />
        </MediaCodec>
        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="104-156" />
+            <Limit name="measured-frame-rate-320x180" range="95-395" />
            <Limit name="measured-frame-rate-640x360" range="76-105" />
            <Limit name="measured-frame-rate-1280x720" range="26-32" />
            <Limit name="measured-frame-rate-1920x1080" range="19-26" />
--- a/media/yupik/media_codecs_yupik_v1.xml
+++ b/media/yupik/media_codecs_yupik_v1.xml
@ -94,6 +94,7 @@
            <Limit name="frame-rate" range="1-240" />
            <Limit name="concurrent-instances" max="16" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
            <Limit name="performance-point-1280x720" value="240" />
@ -110,6 +111,7 @@
            <Limit name="concurrent-instances" max="16" />
            <Feature name="adaptive-playback" />
            <Feature name="low-latency" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
@ -127,6 +129,7 @@
            <Feature name="adaptive-playback" />
            <Feature name="secure-playback" required="true" />
            <Feature name="low-latency" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-3840x2160" value="30" />
        </MediaCodec>
@ -140,6 +143,7 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-240" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
@ -156,6 +160,7 @@
            <Limit name="frame-rate" range="1-240" />
            <Feature name="adaptive-playback" />
            <Feature name="low-latency" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
@ -173,6 +178,7 @@
            <Feature name="adaptive-playback" />
            <Feature name="secure-playback" required="true" />
            <Feature name="low-latency" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-3840x2160" value="30" />
        </MediaCodec>
@ -186,6 +192,7 @@
            <Limit name="bitrate" range="1-100000000" />
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-3840x2160" value="30" />
        </MediaCodec>
@ -200,6 +207,7 @@
            <Limit name="frame-rate" range="1-60" />
            <Feature name="adaptive-playback" />
            <Feature name="secure-playback" required="true" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="3" />
            <Limit name="performance-point-3840x2160" value="30" />
        </MediaCodec>
@ -213,6 +221,7 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="frame-rate" range="1-30" />
            <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="concurrent-instances" max="16" />
            <Limit name="performance-point-1920x1080" value="30" />
        </MediaCodec>
@ -231,6 +240,7 @@
            <Limit name="concurrent-instances" max="16" />
            <Feature name="intra-refresh" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
            <Limit name="performance-point-1280x720" value="240" />
@ -247,6 +257,7 @@
            <Limit name="concurrent-instances" max="16" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
            <Feature name="intra-refresh" />
+            <Feature name="can-swap-width-height" required="true" />
            <Limit name="performance-point-3840x2160" value="30" />
            <Limit name="performance-point-1920x1080" value="120" />
            <Limit name="performance-point-1280x720" value="240" />