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

Merge "Add KEY_CAPTION_SERVICE_NUMBER to MediaFormat"

Browse Source
This commit is contained in:
Santiago Seifert
2020-02-17 10:45:30 +00:00
committed by Android (Google) Code Review
parent 02684dec58 590e248491
commit c3e3933770
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -26130,6 +26130,7 @@ package android.media {
field public static final String KEY_AUDIO_SESSION_ID = "audio-session-id";
field public static final String KEY_BITRATE_MODE = "bitrate-mode";
field public static final String KEY_BIT_RATE = "bitrate";
field public static final String KEY_CAPTION_SERVICE_NUMBER = "caption-service-number";
field public static final String KEY_CAPTURE_RATE = "capture-rate";
field public static final String KEY_CHANNEL_COUNT = "channel-count";
field public static final String KEY_CHANNEL_MASK = "channel-mask";

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

@@ -20,8 +20,6 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage;
import android.media.MediaCodec;
import android.media.MediaParser;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -116,6 +114,7 @@ import java.util.stream.Collectors;
* <table>
* <tr><td>{@link #KEY_MIME}</td><td>String</td><td>The type of the format.</td></tr>
* <tr><td>{@link #KEY_LANGUAGE}</td><td>String</td><td>The language of the content.</td></tr>
* <tr><td>{@link #KEY_CAPTION_SERVICE_NUMBER}</td><td>int</td><td>optional, the closed-caption service or channel number.</td></tr>
* </table>
*
* Image formats have the following keys:
@@ -244,6 +243,13 @@ public final class MediaFormat {
*/
public static final String KEY_LANGUAGE = "language";
/**
* A key describing the closed caption service number. For CEA-608 caption tracks, holds the
* channel number. For CEA-708, holds the service number.
* The associated value is an int.
*/
public static final String KEY_CAPTION_SERVICE_NUMBER = "caption-service-number";
/**
* A key describing the sample rate of an audio format.
* The associated value is an integer