Merge "media: Add new key for latency support" (06067a1f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22166,6 +22166,7 @@ package android.media {
		field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";
		field public static final java.lang.String KEY_I_FRAME_INTERVAL = "i-frame-interval";
		field public static final java.lang.String KEY_LANGUAGE = "language";
		field public static final java.lang.String KEY_LATENCY = "latency";
		field public static final java.lang.String KEY_LEVEL = "level";
		field public static final java.lang.String KEY_MAX_HEIGHT = "max-height";
		field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -23854,6 +23854,7 @@ package android.media {
		field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";
		field public static final java.lang.String KEY_I_FRAME_INTERVAL = "i-frame-interval";
		field public static final java.lang.String KEY_LANGUAGE = "language";
		field public static final java.lang.String KEY_LATENCY = "latency";
		field public static final java.lang.String KEY_LEVEL = "level";
		field public static final java.lang.String KEY_MAX_HEIGHT = "max-height";
		field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22262,6 +22262,7 @@ package android.media {
		field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";
		field public static final java.lang.String KEY_I_FRAME_INTERVAL = "i-frame-interval";
		field public static final java.lang.String KEY_LANGUAGE = "language";
		field public static final java.lang.String KEY_LATENCY = "latency";
		field public static final java.lang.String KEY_LEVEL = "level";
		field public static final java.lang.String KEY_MAX_HEIGHT = "max-height";
		field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";

media/java/android/media/MediaFormat.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import java.util.Map;
		* time-interval between key frames.
		* Float support added in {@link android.os.Build.VERSION_CODES#N_MR1}</td></tr>
		* <tr><td>{@link #KEY_INTRA_REFRESH_PERIOD}</td><td>Integer</td><td><b>encoder-only</b>, optional</td></tr>
		* <tr><td>{@link #KEY_LATENCY}</td><td>Integer</td><td><b>encoder-only</b>, optional</td></tr>
		* <tr><td>{@link #KEY_MAX_WIDTH}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution width</td></tr>
		* <tr><td>{@link #KEY_MAX_HEIGHT}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution height</td></tr>
		* <tr><td>{@link #KEY_REPEAT_PREVIOUS_FRAME_AFTER}</td><td>Long</td><td><b>encoder in surface-mode
		@@ -576,6 +577,18 @@ public final class MediaFormat {
		*/
		public static final String KEY_LEVEL = "level";

		/**
		* An optional key describing the desired encoder latency in frames. This is an optional
		* parameter that applies only to video encoders. If encoder supports it, it should ouput
		* at least one output frame after being queued the specified number of frames. This key
		* is ignored if the video encoder does not support the latency feature. Use the output
		* format to verify that this feature was enabled and the actual value used by the encoder.
		* <p>
		* If the key is not specified, the default latency will be implenmentation specific.
		* The associated value is an integer.
		*/
		public static final String KEY_LATENCY = "latency";

		/**
		* A key describing the desired clockwise rotation on an output surface.
		* This key is only used when the codec is configured using an output surface.