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

Commit 32a40d3d authored by Fyodor Kyslov's avatar Fyodor Kyslov
Browse files

av1codec: adjust AV1 SW codec limits

According to CDD AV1 encoder shall be avaialble on both slow-cpu and
!slow-cpu. Adjust those limits

Bug: b/268566107

Change-Id: Ie9773ffd1b8e278b0d45ac4efade553d39ef49b1
parent 1bc85654
Loading
Loading
Loading
Loading
+14 −5
Original line number Original line Diff line number Diff line
@@ -77,14 +77,23 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="bitrate" range="1-40000000" />
            <Feature name="adaptive-playback" />
            <Feature name="adaptive-playback" />
        </MediaCodec>
        </MediaCodec>
        <MediaCodec name="c2.android.av1.decoder" type="video/av01">
        <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="slow-cpu,!slow-cpu">
            <Limit name="size" min="96x96" max="1920x1080" />
            <Limit name="alignment" value="1x1" />
            <Limit name="alignment" value="1x1" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-size" value="16x16" />
            <Limit name="blocks-per-second" min="24" max="2073600" />
            <Variant name="!slow-cpu">
            <Limit name="bitrate" range="1-120000000" />
                <Limit name="size" min="2x2" max="2048x2048" />
            <Limit name="frame-rate" range="1-60" />
                <Limit name="block-count" range="1-8192" /> <!-- max 2048x1024 -->
                <Limit name="blocks-per-second" range="1-245760" />
                <Limit name="bitrate" range="1-40000000" />
            </Variant>
            <Variant name="slow-cpu">
                <Limit name="size" min="2x2" max="1280x1280" />
                <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
                <Limit name="blocks-per-second" range="1-108000" />
                <Limit name="bitrate" range="1-5000000" />
            </Variant>
            <Feature name="adaptive-playback" />
            <Feature name="adaptive-playback" />
            <Attribute name="software-codec" />
        </MediaCodec>
        </MediaCodec>
    </Decoders>
    </Decoders>


+0 −9
Original line number Original line Diff line number Diff line
@@ -118,14 +118,5 @@
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="bitrate" range="1-40000000" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
        </MediaCodec>
        </MediaCodec>
        <MediaCodec name="c2.android.av1.encoder" type="video/av01">
            <Limit name="size" min="2x2" max="2048x2048" />
            <Limit name="alignment" value="2x2" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-count" range="1-3600" />
            <Limit name="bitrate" range="1-40000000" />
            <Limit name="quality" range="0-100"  default="80" />
            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
        </MediaCodec>
    </Encoders>
    </Encoders>
</Included>
</Included>
+26 −9
Original line number Original line Diff line number Diff line
@@ -199,13 +199,22 @@
            <Feature name="adaptive-playback" />
            <Feature name="adaptive-playback" />
            <Attribute name="software-codec" />
            <Attribute name="software-codec" />
        </MediaCodec>
        </MediaCodec>
        <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="!slow-cpu">
        <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="slow-cpu,!slow-cpu">
            <Limit name="size" min="2x2" max="2048x2048" />
            <!-- TODO: implement a mechanism to prevent AV1 Decoder usage on pre-U devices -->
            <Limit name="alignment" value="1x1" />
            <Limit name="alignment" value="1x1" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-count" range="1-16384" />
            <Variant name="!slow-cpu">
            <Limit name="blocks-per-second" range="1-2073600" />
                <Limit name="size" min="2x2" max="2048x2048" />
            <Limit name="bitrate" range="1-120000000" />
                <Limit name="block-count" range="1-8192" /> <!-- max 2048x1024 -->
                <Limit name="blocks-per-second" range="1-245760" />
                <Limit name="bitrate" range="1-40000000" />
            </Variant>
            <Variant name="slow-cpu">
                <Limit name="size" min="2x2" max="1280x1280" />
                <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->
                <Limit name="blocks-per-second" range="1-108000" />
                <Limit name="bitrate" range="1-5000000" />
            </Variant>
            <Feature name="adaptive-playback" />
            <Feature name="adaptive-playback" />
            <Attribute name="software-codec" />
            <Attribute name="software-codec" />
        </MediaCodec>
        </MediaCodec>
@@ -351,12 +360,20 @@
            <Feature name="bitrate-modes" value="VBR,CBR" />
            <Feature name="bitrate-modes" value="VBR,CBR" />
            <Attribute name="software-codec" />
            <Attribute name="software-codec" />
        </MediaCodec>
        </MediaCodec>
        <MediaCodec name="c2.android.av1.encoder" type="video/av01" variant="!slow-cpu">
        <MediaCodec name="c2.android.av1.encoder" type="video/av01" variant="slow-cpu,!slow-cpu">
            <Limit name="size" min="2x2" max="2048x2048" />
            <!-- TODO: implement a mechanism to prevent AV1 Encoder usage on pre-U devices -->
            <Limit name="alignment" value="2x2" />
            <Limit name="alignment" value="2x2" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-size" value="16x16" />
            <Limit name="block-count" range="1-8200" />
            <Variant name="!slow-cpu">
            <Limit name="bitrate" range="1-40000000" />
                <Limit name="size" min="2x2" max="1920x1920" />
                <Limit name="block-count" range="1-8100" /> <!-- max 1920x1080 -->
                <Limit name="bitrate" range="1-20000000" />
            </Variant>
            <Variant name="slow-cpu">
                <Limit name="size" min="2x2" max="720x720" />
                <Limit name="block-count" range="1-1350" /> <!-- max 720x480 -->
                <Limit name="bitrate" range="1-5000000" />
            </Variant>
            <Limit name="quality" range="0-100"  default="80" />
            <Limit name="quality" range="0-100"  default="80" />
            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />
            <Attribute name="software-codec" />
            <Attribute name="software-codec" />