Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b3fb581 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I8f73c339c82cd0a49d6fba295667280daaa8ce31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c0158e6 acb4e743

media/libstagefright/data/media_codecs_sw.xml

+1 −2
Original line number Diff line number Diff line
@@ -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">