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

Commit eb9ed7ff authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge "media: MediaCodecInfo: Unhide COLOR_FormatYUVP010" am: 32c80f0b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960659

Change-Id: I1e6f0260eceb32cc68c1222b94587a8985270ee9
parents c5c82696 32c80f0b

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21986,6 +21986,7 @@ package android.media { 
    field @Deprecated public static final int COLOR_FormatYUV422SemiPlanar = 24; // 0x18

    field public static final int COLOR_FormatYUV444Flexible = 2135181448; // 0x7f444888

    field @Deprecated public static final int COLOR_FormatYUV444Interleaved = 29; // 0x1d

    field public static final int COLOR_FormatYUVP010 = 54; // 0x36

    field @Deprecated public static final int COLOR_QCOM_FormatYUV420SemiPlanar = 2141391872; // 0x7fa30c00

    field @Deprecated public static final int COLOR_TI_FormatYUV420PackedSemiPlanar = 2130706688; // 0x7f000100

    field public static final String FEATURE_AdaptivePlayback = "adaptive-playback";

media/java/android/media/MediaCodecInfo.java

+24 −4
Original line number Diff line number Diff line
@@ -426,10 +426,30 @@ public final class MediaCodecInfo { 
        /** @deprecated Use {@link #COLOR_Format32bitABGR8888}. */

        public static final int COLOR_Format24BitABGR6666           = 43;



        /** @hide

         * P010 is a 4:2:0 YCbCr semiplanar format comprised of a WxH Y plane

         * followed by a Wx(H/2) CbCr plane. Each sample is represented by a 16-bit

         * little-endian value, with the lower 6 bits set to zero. */

        /**

         * P010 is 10-bit-per component 4:2:0 YCbCr semiplanar format.

         * <p>

         * This format uses 24 allocated bits per pixel with 15 bits of

         * data per pixel. Chroma planes are subsampled by 2 both

         * horizontally and vertically. Each chroma and luma component

         * has 16 allocated bits in little-endian configuration with 10

         * MSB of actual data.

         *

         * <pre>

         *            byte                   byte

         *  <--------- i --------> | <------ i + 1 ------>

         * +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+

         * |     UNUSED      |      Y/Cb/Cr                |

         * +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+

         *  0               5 6   7 0                    7

         * bit

         * </pre>

         *

         * Use this format with {@link Image}. This format corresponds

         * to {@link android.graphics.ImageFormat#YCBCR_P010}.

         * <p>

         */

        @SuppressLint("AllUpper")

        public static final int COLOR_FormatYUVP010                 = 54;



        /** @deprecated Use {@link #COLOR_FormatYUV420Flexible}. */