commit 77d0e03604c7610b80c8639c1a37ad351294cb39
author Vignesh Venkatasubramanian <vigneshv@google.com> Thu Mar 03 22:41:39 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 22:41:39 2022 +0000
tree b84c41520a685e080c6eeba735bc9f680ecdd408
parent f80fc08e00b4f124776f1b8bc6aec2d43148dab8
parent 12ae9fb56a1b4f4bc2725fb4b39b2914dfc5b3b1

Merge "av1: Allow odd width/height for YUV420" into sc-mainline-prod

media/libstagefright/data/media_codecs_google_c2_video.xml

diff --git a/media/libstagefright/data/media_codecs_google_c2_video.xml b/media/libstagefright/data/media_codecs_google_c2_video.xml
index 04041eb..3509ef8 100644
--- a/media/libstagefright/data/media_codecs_google_c2_video.xml
+++ b/media/libstagefright/data/media_codecs_google_c2_video.xml
@@ -79,7 +79,7 @@
         </MediaCodec>
         <MediaCodec name="c2.android.av1.decoder" type="video/av01">
             <Limit name="size" min="96x96" max="1920x1080" />
-            <Limit name="alignment" value="2x2" />
+            <Limit name="alignment" value="1x1" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="24" max="2073600" />
             <Limit name="bitrate" range="1-120000000" />

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 53ca4e7..d7e2d18 100644
--- a/media/libstagefright/data/media_codecs_sw.xml
+++ b/media/libstagefright/data/media_codecs_sw.xml
@@ -184,7 +184,7 @@
         </MediaCodec>
         <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="!slow-cpu">
             <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
+            <Limit name="alignment" value="1x1" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-16384" />
             <Limit name="blocks-per-second" range="1-2073600" />