commit faa84c84f9c8f51d08444ef0d85dbd80cb2dbb6a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 22 23:37:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 23:37:21 2020 +0000
tree ad3a86a112b1594756ba4a017db15498b15f006b
parent 636b1197aab45a41a815e9808afea4c33606b543
parent eb622de2f80055505b921a05484178b150232796

Merge "C2SoftHevcEnc: Increase supported resolution to 960x544" into rvc-dev am: eb622de2f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11899602

Change-Id: Ia357112d3b046630db6a68966d5dc1d252df10b7

media/libstagefright/data/media_codecs_sw.xml

diff --git a/media/libstagefright/data/media_codecs_sw.xml b/media/libstagefright/data/media_codecs_sw.xml
index dd2eed3..6571162 100644
--- a/media/libstagefright/data/media_codecs_sw.xml
+++ b/media/libstagefright/data/media_codecs_sw.xml
@@ -295,12 +295,12 @@
             <Feature name="bitrate-modes" value="VBR,CBR" />
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" variant="!slow-cpu">
-            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
-            <Limit name="size" min="2x2" max="512x512" />
+            <!-- profiles and levels:  ProfileMain : MainTierLevel3 -->
+            <Limit name="size" min="2x2" max="960x544" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="8x8" />
-            <Limit name="block-count" range="1-4096" /> <!-- max 512x512 -->
-            <Limit name="blocks-per-second" range="1-122880" />
+            <Limit name="block-count" range="1-8160" /> <!-- max 960x544 -->
+            <Limit name="blocks-per-second" range="1-244880" />
             <Limit name="frame-rate" range="1-120" />
             <Limit name="bitrate" range="1-10000000" />
             <Limit name="complexity" range="0-10"  default="0" />