Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Hide MediaFormat#KEY_SLOW_MOTION_MARKERS""

Browse Source
This commit is contained in:
Jeff Sharkey
2021-06-05 20:23:33 +00:00
committed by Android (Google) Code Review
parent 163a661d6f d641efeb18
commit b42faf3ca0
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -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";

2
media/java/android/media/MediaFormat.java
View File

@@ -501,8 +501,6 @@ 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";