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

Commit f8a19b7f authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Automerger Merge Worker
Browse files

Merge "Restrict APV codec to Android B and above" into main am: d929113a am: f369ea06 

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



Change-Id: I2f5c63c011444682f04ec28cb92e051209d06c90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c618f21c f369ea06

media/libstagefright/data/media_codecs_google_c2_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
            <Feature name="adaptive-playback" />

            <Attribute name="software-codec" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.decoder" type="video/apv">

        <MediaCodec name="c2.android.apv.decoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="16x16" max="1920x1920"/>

            <Limit name="alignment" value="2x2"/>

            <Limit name="bitrate" range="1-240000000"/>
@@ -168,7 +168,7 @@ 
            <Limit name="bitrate" range="1-40000000" />

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

        </MediaCodec>

        <MediaCodec name="c2.android.apv.encoder" type="video/apv">

        <MediaCodec name="c2.android.apv.encoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="2x2" max="1920x1920" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="16x16" />

media/libstagefright/data/media_codecs_sw.xml

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ 
            <Feature name="adaptive-playback" />

            <Attribute name="software-codec" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.decoder" type="video/apv">

        <MediaCodec name="c2.android.apv.decoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="16x16" max="1920x1920"/>

            <Limit name="alignment" value="2x2"/>

            <Limit name="bitrate" range="1-240000000"/>
@@ -417,7 +417,7 @@ 
            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

        </MediaCodec>

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

        <MediaCodec name="c2.android.apv.encoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="2x2" max="1920x1920" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="16x16" />