diff --git a/core/api/current.txt b/core/api/current.txt index d59a2351605f6..2a0306e7477f1 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -22563,6 +22563,7 @@ 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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index a6c1aac90a423..9bf0db52f66d7 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -501,8 +501,6 @@ public final class MediaFormat { *
  • The timestampUs shall be monotonically increasing.
  • *
  • The timestampUs shall fall within the time span of the video track.
  • *
  • The first timestampUs should match that of the first video sample.
  • - * - * @hide */ public static final String KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";