am b1980049: Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev

* commit 'b1980049855fd6c53e109b44ff012a053f9436f7':
  Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
This commit is contained in:
James Dong
2012-08-01 10:37:36 -07:00
committed by Android Git Automerger
2 changed files with 6 additions and 0 deletions

View File

@@ -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

View File

@@ -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...
}