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

Commit 4a1b668c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide MediaFormat#KEY_SLOW_MOTION_MARKERS"

parents 491919f2 fc0dd526

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -21941,7 +21941,6 @@ package android.media { 
    field public static final String KEY_ROTATION = "rotation-degrees";

    field public static final String KEY_SAMPLE_RATE = "sample-rate";

    field public static final String KEY_SLICE_HEIGHT = "slice-height";

    field public static final String KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";

    field public static final String KEY_STRIDE = "stride";

    field public static final String KEY_TEMPORAL_LAYERING = "ts-schema";

    field public static final String KEY_TILE_HEIGHT = "tile-height";

media/java/android/media/MediaFormat.java

+2 −0
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ public final class MediaFormat { 
     * <li>The timestampUs shall be monotonically increasing.</li>

     * <li>The timestampUs shall fall within the time span of the video track.</li>

     * <li>The first timestampUs should match that of the first video sample.</li>

     *

     * @hide

     */

    public static final String KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";