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

Commit 76948700 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media_codecs: limit platform AVC decoder to 4080x4080 resolution" into... 

Merge "media_codecs: limit platform AVC decoder to 4080x4080 resolution" into oc-mr1-dev am: ba248a45
am: 729ee115

Change-Id: I539ed6abbcf83a85294239b8874c438b3f1e3ba8
parents 6f89acb8 729ee115

media/libstagefright/data/media_codecs_google_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 
        </MediaCodec>

        <MediaCodec name="OMX.google.h264.decoder" type="video/avc">

            <!-- profiles and levels:  ProfileHigh : Level52 -->

            <Limit name="size" min="2x2" max="4096x4096" />

            <Limit name="size" min="2x2" max="4080x4080" />

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

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

            <Limit name="block-count" range="1-32768" /> <!-- max 4096x2048 -->

            <Limit name="block-count" range="1-32768" /> <!-- max 4096x2048 equivalent -->

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

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

            <Feature name="adaptive-playback" />