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

Commit 25ff94b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 76df1b46 to master (2)"

parents 571738b5 8f83fba2

media/libstagefright/data/media_codecs_google_c2_video.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
            <Limit name="bitrate" range="1-40000000" />

            <Feature name="adaptive-playback" />

        </MediaCodec>

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

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

            <Limit name="size" min="96x96" max="1920x1080" />

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

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

media/libstagefright/data/media_codecs_sw.xml

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
            </Variant>

            <Feature name="adaptive-playback" />

        </MediaCodec>

        <MediaCodec name="c2.android.gav1.decoder" type="video/av01" variant="!slow-cpu">

        <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="!slow-cpu">

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

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

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