commit acb4e743b136198a8518e7273045b0e89944f531
author Ray Essick <essick@google.com> Thu Mar 16 21:48:41 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 16 21:48:41 2023 +0000
tree 8697127a12e10314db33904d7bbb8412c36df0ab
parent 896b59eff66ad6a1db9c10cc5bf7ba5809be4b11
parent b61542131df62c148a1fddd0c5acf7ea94def415

Merge "c2.android.av1.encoder enabled only on systems >= U" into udc-dev

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 d01e326..d3fd790 100644
--- a/media/libstagefright/data/media_codecs_sw.xml
+++ b/media/libstagefright/data/media_codecs_sw.xml
@@ -360,8 +360,7 @@
             <Feature name="bitrate-modes" value="VBR,CBR" />
             <Attribute name="software-codec" />
         </MediaCodec>
-        <MediaCodec name="c2.android.av1.encoder" type="video/av01" variant="slow-cpu,!slow-cpu">
-            <!-- TODO: implement a mechanism to prevent AV1 Encoder usage on pre-U devices -->
+        <MediaCodec name="c2.android.av1.encoder" type="video/av01" enabled="false" minsdk="34" variant="slow-cpu,!slow-cpu">
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Variant name="!slow-cpu">