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

Merge "transcoding: Hide SlowMotion in ApplicationMediaCapabilities."

Browse Source
This commit is contained in:
Hangyu Kuang
2021-01-21 21:24:48 +00:00
committed by Android (Google) Code Review
parent 57d27a25f7 c75c185169
commit 7a52ee0814
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/media/framework/api/current.txt
View File

@@ -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 {

8
apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
View File

@@ -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";
@@ -260,6 +254,7 @@ public final class ApplicationMediaCapabilities implements Parcelable {
/*
* Whether handling of slow-motion video is supported
* @hide
*/
public boolean isSlowMotionSupported() {
return mIsSlowMotionSupported;
@@ -578,6 +573,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) {