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

Commit 3ed95fe2 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev

parents 77e25331 5037f945

media/java/android/media/MediaCodec.java

+4 −4
Original line number Diff line number Diff line
@@ -1784,11 +1784,11 @@ final public class MediaCodec { 
            mYOffset = yOffset;

            mInfo = info;



            // read media-info.  the size of media info can be 80 or 156 depending on

            // read media-info.  the size of media info can be 80 or 156/160 depending on

            // whether it was created on a 32- or 64-bit process.  See MediaImage

            if (info.remaining() == 80 || info.remaining() == 156) {

                boolean sizeIsLong = info.remaining() == 156;

                int type = info.getInt();

            if (info.remaining() == 80 || info.remaining() == 156 || info.remaining() == 160) {

                boolean sizeIsLong = info.remaining() != 80;

                int type = readInt(info, info.remaining() == 160);

                if (type != TYPE_YUV) {

                    throw new UnsupportedOperationException("unsupported type: " + type);

                }