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

Revert "Hide MediaFormat#KEY_SLOW_MOTION_MARKERS"

Browse Source 
This reverts commit fc0dd526c9.

Reason for revert: b/190241620
Bug: 190241620

Change-Id: I4f39a6d3e875dd261f24105c5e01033b597d88d3
This commit is contained in:
Anton Hansson
2021-06-05 16:32:10 +00:00
committed by Jeff Sharkey
parent fc0dd526c9
commit d641efeb18
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

@@ -21889,6 +21889,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

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