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

Commit 293e9410 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2: Advertise support for FEATURE_QpBounds in s/w video encoders" into... 

Merge "C2: Advertise support for FEATURE_QpBounds in s/w video encoders" into main am: 12869820 am: e4dbc328

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



Change-Id: I2051c60b27d4f5d20c2150065a0360da5751c358
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09b9bb29 e4dbc328

media/libstagefright/data/media_codecs_sw.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -353,6 +353,7 @@ 
                <Limit name="bitrate" range="1-20000000" />

                <Limit name="bitrate" range="1-20000000" />

            </Variant>

            </Variant>

            <Feature name="bitrate-modes" value="VBR,CBR" />

            <Feature name="bitrate-modes" value="VBR,CBR" />

            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

            <Attribute name="software-codec" />

        </MediaCodec>

        </MediaCodec>

        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" variant="!slow-cpu">

        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" variant="!slow-cpu">
@@ -367,6 +368,7 @@ 
            <Limit name="complexity" range="0-10"  default="0" />

            <Limit name="complexity" range="0-10"  default="0" />

            <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" />

            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

            <Attribute name="software-codec" />

        </MediaCodec>

        </MediaCodec>

        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" variant="!slow-cpu">

        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" variant="!slow-cpu">
@@ -379,6 +381,7 @@ 
            <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->

            <Limit name="block-count" range="1-3600" /> <!-- max 1280x720 -->

            <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" />

            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

            <Attribute name="software-codec" />

        </MediaCodec>

        </MediaCodec>

        <MediaCodec name="c2.android.av1.encoder" type="video/av01" enabled="false" minsdk="34" variant="slow-cpu,!slow-cpu">

        <MediaCodec name="c2.android.av1.encoder" type="video/av01" enabled="false" minsdk="34" variant="slow-cpu,!slow-cpu">
@@ -397,6 +400,7 @@ 
            <Limit name="quality" range="0-100"  default="80" />

            <Limit name="quality" range="0-100"  default="80" />

            <Limit name="complexity" range="0-5"  default="0" />

            <Limit name="complexity" range="0-5"  default="0" />

            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />

            <Feature name="bitrate-modes" value="VBR,CBR,CQ" />

            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

            <Attribute name="software-codec" />

        </MediaCodec>

        </MediaCodec>

    </Encoders>

    </Encoders>