commit 8f73a1be7c1550b791593e59d7ec787187014839
author Chong Zhang <chz@google.com> Tue Apr 07 17:29:51 2015 -0700
committer Chong Zhang <chz@google.com> Tue Apr 07 17:32:16 2015 -0700
tree fe5c736c7d02b91679097c804b57678a5204bb3f
parent 988e3a570f2b7d709636055a1fe63b1e22702c5c

MediaMetadataRetriever: add key for capture fps

bug: 19460202
Change-Id: I3b7ebe298d78bbd292cf6202c43da674e43db854

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 11a5083..55bc392 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15533,6 +15533,7 @@
     field public static final int METADATA_KEY_ARTIST = 2; // 0x2
     field public static final int METADATA_KEY_AUTHOR = 3; // 0x3
     field public static final int METADATA_KEY_BITRATE = 20; // 0x14
+    field public static final int METADATA_KEY_CAPTURE_FRAMERATE = 25; // 0x19
     field public static final int METADATA_KEY_CD_TRACK_NUMBER = 0; // 0x0
     field public static final int METADATA_KEY_COMPILATION = 15; // 0xf
     field public static final int METADATA_KEY_COMPOSER = 4; // 0x4

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9513ab6..7c3379a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16735,6 +16735,7 @@
     field public static final int METADATA_KEY_ARTIST = 2; // 0x2
     field public static final int METADATA_KEY_AUTHOR = 3; // 0x3
     field public static final int METADATA_KEY_BITRATE = 20; // 0x14
+    field public static final int METADATA_KEY_CAPTURE_FRAMERATE = 25; // 0x19
     field public static final int METADATA_KEY_CD_TRACK_NUMBER = 0; // 0x0
     field public static final int METADATA_KEY_COMPILATION = 15; // 0xf
     field public static final int METADATA_KEY_COMPOSER = 4; // 0x4

media/java/android/media/MediaMetadataRetriever.java

diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java
index 9a69c06..9aa8003 100644
--- a/media/java/android/media/MediaMetadataRetriever.java
+++ b/media/java/android/media/MediaMetadataRetriever.java
@@ -498,5 +498,11 @@
      * The video rotation angle may be 0, 90, 180, or 270 degrees.
      */
     public static final int METADATA_KEY_VIDEO_ROTATION = 24;
+    /**
+     * This key retrieves the original capture framerate, if it's
+     * available. The capture framerate will be a floating point
+     * number.
+     */
+    public static final int METADATA_KEY_CAPTURE_FRAMERATE = 25;
     // Add more here...
 }