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

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

Merge "media: Add constants for CBP and CHP for AVC codecs"

parents 4de4de3f 9da5f1ba

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22170,6 +22170,8 @@ package android.media { 
    field public static final int AVCLevel51 = 32768; // 0x8000

    field public static final int AVCLevel52 = 65536; // 0x10000

    field public static final int AVCProfileBaseline = 1; // 0x1

    field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000

    field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000

    field public static final int AVCProfileExtended = 4; // 0x4

    field public static final int AVCProfileHigh = 8; // 0x8

    field public static final int AVCProfileHigh10 = 16; // 0x10

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24111,6 +24111,8 @@ package android.media { 
    field public static final int AVCLevel51 = 32768; // 0x8000

    field public static final int AVCLevel52 = 65536; // 0x10000

    field public static final int AVCProfileBaseline = 1; // 0x1

    field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000

    field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000

    field public static final int AVCProfileExtended = 4; // 0x4

    field public static final int AVCProfileHigh = 8; // 0x8

    field public static final int AVCProfileHigh10 = 16; // 0x10

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22281,6 +22281,8 @@ package android.media { 
    field public static final int AVCLevel51 = 32768; // 0x8000

    field public static final int AVCLevel52 = 65536; // 0x10000

    field public static final int AVCProfileBaseline = 1; // 0x1

    field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000

    field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000

    field public static final int AVCProfileExtended = 4; // 0x4

    field public static final int AVCProfileHigh = 8; // 0x8

    field public static final int AVCProfileHigh10 = 16; // 0x10

media/java/android/media/MediaCodecInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -2861,6 +2861,8 @@ public final class MediaCodecInfo { 
        public static final int AVCProfileHigh10   = 0x10;

        public static final int AVCProfileHigh422  = 0x20;

        public static final int AVCProfileHigh444  = 0x40;

        public static final int AVCProfileConstrainedBaseline = 0x10000;

        public static final int AVCProfileConstrainedHigh     = 0x80000;



        // from OMX_VIDEO_AVCLEVELTYPE

        public static final int AVCLevel1       = 0x01;