commit 9af92dadc9ceaa76997753f7199f5ecfeb820327
author Chong Zhang <chz@google.com> Thu Oct 05 15:12:36 2017 -0700
committer Chong Zhang <chz@google.com> Thu Oct 05 15:13:54 2017 -0700
tree f82dcc65b24ad2f80807d91372ae58e004a85c38
parent 440240db5c1e8d329f70b16cd36976a0f3bfac4e

Use rotation from MediaMetadataRetriever directly

MediaMetadataRetriever now reports rotation in clockwise,
no longer need to translate.

bug: 67470228

Test: verified rotation using test app attached in bug
Change-Id: Ifebcf25ea302477818e2e03db1e55525db985e67

media/java/android/media/ExifInterface.java

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index bbeaa4b..bf3a3b9 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -2583,22 +2583,21 @@
                             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;
                     }