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

Commit 6c08cfff authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "media: Unhide mpeg2ts format for streaming output format support."

parents e8709289 5b168a0c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21462,6 +21462,7 @@ package android.media { 
    field public static final int AMR_NB = 3; // 0x3

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

    field public static final int DEFAULT = 0; // 0x0

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

    field public static final int MPEG_4 = 2; // 0x2

    field public static final deprecated int RAW_AMR = 3; // 0x3

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22994,6 +22994,7 @@ package android.media { 
    field public static final int AMR_NB = 3; // 0x3

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

    field public static final int DEFAULT = 0; // 0x0

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

    field public static final int MPEG_4 = 2; // 0x2

    field public static final deprecated int RAW_AMR = 3; // 0x3

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21535,6 +21535,7 @@ package android.media { 
    field public static final int AMR_NB = 3; // 0x3

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

    field public static final int DEFAULT = 0; // 0x0

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

    field public static final int MPEG_4 = 2; // 0x2

    field public static final deprecated int RAW_AMR = 3; // 0x3

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

media/java/android/media/MediaRecorder.java

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ public class MediaRecorder 
        /** @hide Stream over a socket, limited to a single stream */

        public static final int OUTPUT_FORMAT_RTP_AVP = 7;



        /** @hide H.264/AAC data encapsulated in MPEG2/TS */

        public static final int OUTPUT_FORMAT_MPEG2TS = 8;

        /** H.264/AAC data encapsulated in MPEG2/TS */

        public static final int MPEG_2_TS = 8;



        /** VP8/VORBIS data in a WEBM container */

        public static final int WEBM = 9;