From fc0dd526c9d7ead8cc76345c5f96f7cd22750bc8 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Mon, 8 Feb 2021 16:57:47 -0800 Subject: [PATCH] Hide MediaFormat#KEY_SLOW_MOTION_MARKERS This key was added for slomo flattening in seamless transcoding. Since flattening is going to use exoplayer, hide the key. bug: 169242631 Change-Id: I978329d897876e1ddd9508b772158cc4fdbf146f --- core/api/current.txt | 1 - media/java/android/media/MediaFormat.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index 6eb3ff88bec81..4106c3b4e32f0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -21889,7 +21889,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 1a49b85403e44..de2c56afd6d9f 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -480,6 +480,8 @@ 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";