Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb34ca3 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "MediaMetadataRetriever: add key for capture fps"

parents 11145938 8f73a1be

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15599,6 +15599,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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16809,6 +16809,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

media/java/android/media/MediaMetadataRetriever.java

+6 −0
Original line number Diff line number Diff line
@@ -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...

}