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

Commit b9c40341 authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by Android (Google) Code Review
Browse files

Merge "vpx: Allow odd width/height decoding"

parents 081bd6f6 81fe2ca5

media/libstagefright/data/media_codecs_google_c2_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8">

            <Alias name="OMX.google.vp8.decoder" />

            <Limit name="size" min="2x2" max="2048x2048" />

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

            <Limit name="alignment" value="1x1" />

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

            <Limit name="block-count" range="1-16384" />

            <Limit name="blocks-per-second" range="1-1000000" />
@@ -70,7 +70,7 @@ 
        <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9">

            <Alias name="OMX.google.vp9.decoder" />

            <Limit name="size" min="2x2" max="2048x2048" />

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

            <Limit name="alignment" value="1x1" />

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

            <Limit name="block-count" range="1-16384" />

            <Limit name="blocks-per-second" range="1-500000" />

media/libstagefright/data/media_codecs_sw.xml

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" variant="slow-cpu,!slow-cpu">

            <Alias name="OMX.google.vp8.decoder" />

            <Limit name="size" min="2x2" max="2048x2048" />

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

            <Limit name="alignment" value="1x1" />

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

            <Variant name="!slow-cpu">

                <Limit name="block-count" range="1-16384" />
@@ -166,7 +166,7 @@ 
        </MediaCodec>

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

            <Alias name="OMX.google.vp9.decoder" />

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

            <Limit name="alignment" value="1x1" />

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

            <Variant name="!slow-cpu">

                <Limit name="size" min="2x2" max="2048x2048" />