am 4bca50f3: am a17d4c68: am 1ecdeb58: Merge "MediaFormat: add capture rate key" into lmp-dev (7166133f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14993,6 +14993,7 @@ package android.media {
	field public static final java.lang.String KEY_AAC_SBR_MODE = "aac-sbr-mode";		field public static final java.lang.String KEY_AAC_SBR_MODE = "aac-sbr-mode";
	field public static final java.lang.String KEY_BITRATE_MODE = "bitrate-mode";		field public static final java.lang.String KEY_BITRATE_MODE = "bitrate-mode";
	field public static final java.lang.String KEY_BIT_RATE = "bitrate";		field public static final java.lang.String KEY_BIT_RATE = "bitrate";
			field public static final java.lang.String KEY_CAPTURE_RATE = "capture-rate";
	field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";		field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
	field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";		field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
	field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";		field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";

media/java/android/media/MediaFormat.java

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ import java.util.Map;
	* <tr><td>{@link #KEY_COLOR_FORMAT}</td><td>Integer</td><td>set by the user		* <tr><td>{@link #KEY_COLOR_FORMAT}</td><td>Integer</td><td>set by the user
	* for encoders, readable in the output format of decoders</b></td></tr>		* for encoders, readable in the output format of decoders</b></td></tr>
	* <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td><b>encoder-only</b></td></tr>		* <tr><td>{@link #KEY_FRAME_RATE}</td><td>Integer or Float</td><td><b>encoder-only</b></td></tr>
			* <tr><td>{@link #KEY_CAPTURE_RATE}</td><td>Integer</td><td></td></tr>
	* <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></td></tr>		* <tr><td>{@link #KEY_I_FRAME_INTERVAL}</td><td>Integer</td><td><b>encoder-only</b></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_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_MAX_HEIGHT}</td><td>Integer</td><td><b>decoder-only</b>, optional, max-resolution height</td></tr>
	@@ -205,6 +206,21 @@ public final class MediaFormat {
	*/		*/
	public static final String KEY_FRAME_RATE = "frame-rate";		public static final String KEY_FRAME_RATE = "frame-rate";

			/**
			* A key describing the capture rate of a video format in frames/sec.
			* <p>
			* When capture rate is different than the frame rate, it means that the
			* video is acquired at a different rate than the playback, which produces
			* slow motion or timelapse effect during playback. Application can use the
			* value of this key to tell the relative speed ratio between capture and
			* playback rates when the video was recorded.
			* </p>
			* <p>
			* The associated value is an integer or a float.
			* </p>
			*/
			public static final String KEY_CAPTURE_RATE = "capture-rate";

	/**		/**
	* A key describing the frequency of I frames expressed in secs		* A key describing the frequency of I frames expressed in secs
	* between I frames.		* between I frames.