From 8f73a1be7c1550b791593e59d7ec787187014839 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Tue, 7 Apr 2015 17:29:51 -0700 Subject: [PATCH] MediaMetadataRetriever: add key for capture fps bug: 19460202 Change-Id: I3b7ebe298d78bbd292cf6202c43da674e43db854 --- api/current.txt | 1 + api/system-current.txt | 1 + media/java/android/media/MediaMetadataRetriever.java | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/api/current.txt b/api/current.txt index 11a508352aeb5..55bc39200c0ec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15533,6 +15533,7 @@ package android.media { 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 diff --git a/api/system-current.txt b/api/system-current.txt index 9513ab60b480a..7c3379a9ad48a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16735,6 +16735,7 @@ package android.media { 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 diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 9a69c067e4982..9aa8003e93209 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -498,5 +498,11 @@ public class MediaMetadataRetriever * 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... }