commit 76ef9b07f70a5b71044f3004cde62a3930310e14
author Ronghua Wu <ronghuawu@google.com> Fri Apr 10 20:10:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 10 20:10:04 2015 +0000
tree bf9b33b402b46d78f010663264ef6e4f27135537
parent f42d493697647d3dcf8b32fe7581302fe5f1b512
parent 3392ce4a04b117b77c58f41e9ac0e130327e9431

Merge "media: add MediaFormat.KEY_OPERATING_RATE."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 50f4f59..4048572 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15483,6 +15483,7 @@
     field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";
     field public static final java.lang.String KEY_MAX_WIDTH = "max-width";
     field public static final java.lang.String KEY_MIME = "mime";
+    field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate";
     field public static final java.lang.String KEY_PRIORITY = "priority";
     field public static final java.lang.String KEY_PROFILE = "profile";
     field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9518b18..d3b7576 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16693,6 +16693,7 @@
     field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";
     field public static final java.lang.String KEY_MAX_WIDTH = "max-width";
     field public static final java.lang.String KEY_MIME = "mime";
+    field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate";
     field public static final java.lang.String KEY_PRIORITY = "priority";
     field public static final java.lang.String KEY_PROFILE = "profile";
     field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";

media/java/android/media/MediaFormat.java

diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 0c1c7e9..726622f 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -439,6 +439,22 @@
     public static final String KEY_PRIORITY = "priority";
 
     /**
+     * A key describing the desired operating frame rate for video or sample rate for audio
+     * that the codec will need to operate at.
+     * <p>
+     * The associated value is an integer or a float representing frames-per-second or
+     * samples-per-second
+     * <p>
+     * This is used for cases like high-speed/slow-motion video capture, where the video encoder
+     * format contains the target playback rate (e.g. 30fps), but the component must be able to
+     * handle the high operating capture rate (e.g. 240fps).
+     * <p>
+     * This rate will be used by codec for resource planning and setting the operating points.
+     *
+     */
+    public static final String KEY_OPERATING_RATE = "operating-rate";
+
+    /**
      * A key describing the desired profile to be used by an encoder.
      * Constants are declared in {@link MediaCodecInfo.CodecProfileLevel}.
      * This key is only supported for codecs that specify a profile.