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

Commit b1980049 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Added a key to retrieve the rotation angle in... 

Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev
parents 49771c3b 99848331

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11341,6 +11341,7 @@ package android.media { 
    field public static final int METADATA_KEY_NUM_TRACKS = 10; // 0xa

    field public static final int METADATA_KEY_TITLE = 7; // 0x7

    field public static final int METADATA_KEY_VIDEO_HEIGHT = 19; // 0x13

    field public static final int METADATA_KEY_VIDEO_ROTATION = 24; // 0x18

    field public static final int METADATA_KEY_VIDEO_WIDTH = 18; // 0x12

    field public static final int METADATA_KEY_WRITER = 11; // 0xb

    field public static final int METADATA_KEY_YEAR = 8; // 0x8

media/java/android/media/MediaMetadataRetriever.java

+5 −0
Original line number Diff line number Diff line
@@ -483,5 +483,10 @@ public class MediaMetadataRetriever 
     * of 180 degrees will be retrieved as "-90.0000+180.0000", for instance.

     */

    public static final int METADATA_KEY_LOCATION        = 23;

    /**

     * This key retrieves the video rotation angle in degrees, if available.

     * The video rotation angle may be 0, 90, 180, or 270 degrees.

     */

    public static final int METADATA_KEY_VIDEO_ROTATION = 24;

    // Add more here...

}