summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author hkuang <hkuang@google.com> 2021-01-20 09:39:41 -0800
committer Hangyu Kuang <hkuang@google.com> 2021-01-21 18:26:40 +0000
commitc75c1851693a5dac5a187eb8ee4f6e95dda45a2c (patch)
treef8db2b34bc7dff798a39cc5b23820d4cdf75fcd8
parente86784a2ca5b7144faf9ec5c805ce4689a386d41 (diff)
transcoding: Hide SlowMotion in ApplicationMediaCapabilities.
Bug: 178001803 Test: atest CtsMediaTranscodingTestCases:ApplicationMediaCapabilitiesTest Change-Id: I55d895128c673d6331b0290ab88cc5102de459dd
-rw-r--r--apex/media/framework/api/current.txt1
-rw-r--r--apex/media/framework/java/android/media/ApplicationMediaCapabilities.java8
2 files changed, 2 insertions, 7 deletions
diff --git a/apex/media/framework/api/current.txt b/apex/media/framework/api/current.txt
index 103bb47fca23..2543a9cad576 100644
--- a/apex/media/framework/api/current.txt
+++ b/apex/media/framework/api/current.txt
@@ -22,7 +22,6 @@ package android.media {
method @NonNull public android.media.ApplicationMediaCapabilities.Builder addUnsupportedHdrType(@NonNull String);
method @NonNull public android.media.ApplicationMediaCapabilities.Builder addUnsupportedVideoMimeType(@NonNull String);
method @NonNull public android.media.ApplicationMediaCapabilities build();
- method @NonNull public android.media.ApplicationMediaCapabilities.Builder setSlowMotionSupported(boolean);
}
public static class ApplicationMediaCapabilities.FormatNotFoundException extends android.util.AndroidException {
diff --git a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
index 25ccec2930f1..78be81dc7b4c 100644
--- a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
+++ b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
@@ -56,16 +56,10 @@ import java.util.Set;
* <h4>Capability of handling HDR(high dynamic range) video</h4>
* There are four types of HDR video(Dolby-Vision, HDR10, HDR10+, HLG) supported by the platform,
* application will only need to specify individual types they supported.
- *
- * <h4>Capability of handling Slow Motion video</h4>
- * There is no standard format for slow motion yet. If an application indicates support for slow
- * motion, it is application's responsibility to parse the slow motion videos using their own parser
- * or using support library.
*/
// TODO(huang): Correct openTypedAssetFileDescriptor with the new API after it is added.
// TODO(hkuang): Add a link to seamless transcoding detail when it is published
// TODO(hkuang): Add code sample on how to build a capability object with MediaCodecList
-// TODO(hkuang): Add the support library page on parsing slow motion video.
public final class ApplicationMediaCapabilities implements Parcelable {
private static final String TAG = "ApplicationMediaCapabilities";
@@ -247,6 +241,7 @@ public final class ApplicationMediaCapabilities implements Parcelable {
/*
* Whether handling of slow-motion video is supported
+ * @hide
*/
public boolean isSlowMotionSupported() {
return mIsSlowMotionSupported;
@@ -565,6 +560,7 @@ public final class ApplicationMediaCapabilities implements Parcelable {
* If an application indicates support for slow-motion, it is application's responsibility
* to parse the slow-motion videos using their own parser or using support library.
* @see android.media.MediaFormat#KEY_SLOW_MOTION_MARKERS
+ * @hide
*/
@NonNull
public Builder setSlowMotionSupported(boolean slowMotionSupported) {