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

Commit 9af92dad authored by Chong Zhang's avatar Chong Zhang
Browse files

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
parent 440240db

media/java/android/media/ExifInterface.java

+3 −4
Original line number Diff line number Diff line
@@ -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;

                    }