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

Commit 628d4ea1 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev

parents 231406d5 1338e177

media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -118,10 +118,10 @@ PV_STATUS DecodeVOLHeader(VideoDecData *video, int layer) 
        {

        {

            /* support SPL0-3 & SSPL0-2   */

            /* support SPL0-3 & SSPL0-2   */

            if (tmpvar != 0x01 && tmpvar != 0x02 && tmpvar != 0x03 && tmpvar != 0x08 &&

            if (tmpvar != 0x01 && tmpvar != 0x02 && tmpvar != 0x03 && tmpvar != 0x08 &&

                    /* While not technically supported, try to decode SPL4 files as well. */

                    /* While not technically supported, try to decode SPL4&SPL5 files as well. */

                    /* We'll fail later if the size is too large.  This is to allow playback of */

                    /* We'll fail later if the size is too large.  This is to allow playback of */

                    /* some <=CIF files generated by other encoders. */

                    /* some <=CIF files generated by other encoders. */

                    tmpvar != 0x04 &&

                    tmpvar != 0x04 && tmpvar != 0x05 &&

                    tmpvar != 0x10 && tmpvar != 0x11 && tmpvar != 0x12 &&

                    tmpvar != 0x10 && tmpvar != 0x11 && tmpvar != 0x12 &&

                    tmpvar != 0x21 && tmpvar != 0x22 &&  /* Core Profile Levels */

                    tmpvar != 0x21 && tmpvar != 0x22 &&  /* Core Profile Levels */

                    tmpvar != 0xA1 && tmpvar != 0xA2 && tmpvar != 0xA3 &&

                    tmpvar != 0xA1 && tmpvar != 0xA2 && tmpvar != 0xA3 &&