Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-06 05:20:14 +00:00
committed by Android (Google) Code Review
parent bb3ff15495 9af92dadc9
commit 106aeb324d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/ExifInterface.java
View File

@@ -2583,22 +2583,21 @@ public class ExifInterface {
ExifAttribute.createUShort(Integer.parseInt(height), mExifByteOrder));
}
// Note that the rotation angle from MediaMetadataRetriever for heif images
// are CCW, while rotation in ExifInterface orientations are CW.
String rotation = retriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
if (rotation != null) {
int orientation = ExifInterface.ORIENTATION_NORMAL;
// all rotation angles in CW
switch (Integer.parseInt(rotation)) {
case 90:
orientation = ExifInterface.ORIENTATION_ROTATE_270;
orientation = ExifInterface.ORIENTATION_ROTATE_90;
break;
case 180:
orientation = ExifInterface.ORIENTATION_ROTATE_180;
break;
case 270:
orientation = ExifInterface.ORIENTATION_ROTATE_90;
orientation = ExifInterface.ORIENTATION_ROTATE_270;
break;
}