EXIF orientation support #4529

ActiveChooN · 2022-03-29T08:19:30Z

Motivation and context

Resolve #1059, #738.

This PR adds ability to parse EXIF orientation information when media is uploaded and handle it on the client.

How has this been tested?

Manually

Checklist

I submit my changes into the develop branch
I have added a description of my changes into CHANGELOG file
I have updated the documentation accordingly
I have added tests to cover my changes
I have linked related issues (read github docs)
I have increased versions of npm packages if it is necessary (cvat-canvas,
cvat-core, cvat-data and cvat-ui)

License

I submit my code changes under the same MIT License that covers the project.
Feel free to contact the maintainers if that's a concern.
I have updated the license header for each file (see an example below)

# Copyright (C) 2022 Intel Corporation
#
# SPDX-License-Identifier: MIT

nmanovic · 2022-03-29T14:25:09Z

cvat/apps/engine/models.py

@@ -223,6 +223,7 @@ class Image(models.Model):
    frame = models.PositiveIntegerField()
    width = models.PositiveIntegerField()
    height = models.PositiveIntegerField()
+    orientation = models.PositiveIntegerField(default=1)


@ActiveChooN , could you please explain why we cannot send to UI already "rotated" image? The idea is to incapsulate the knowledge on the server.

Do you mean we should store rotated images on the server side? In that case, there would be a mismatch in the resolution of the raw data and compressed. I don't see a big problem here, but the whole idea behind this PR was to try to not modify the original data if it's possible.

Maybe more general solution is to store received EXIF information as a JSON in our database (as a part of meta information), instead of storing only orientation?

I'm not sure about this. What kind of information can be helpful for us? I think we can move to that solution if we will have such a request to parse and use other EXIF tags. But EXIF usually stores a lot of information like thumbnail and photo instruments info which is quite useless for us but costs a lot of storage.

bsekachev · 2022-03-30T09:15:58Z

cvat/apps/engine/media_extractors.py

@@ -90,13 +90,26 @@ def _get_preview(obj):
        else:
            preview = obj
        preview.thumbnail(PREVIEW_SIZE)
+        orientation = preview._getexif().get(274, 1) if preview._getexif() else 1


Looks like _getexif() is a private method. Using such methods outside is not good practice.
What these magic numbers (274, 1) means is not obvious.

_getexif() is a convenient method to get EXIF information from PIL Image. 274 is the Orientation key, it can be gotten via

(orientation_key,_), = filter(lambda kv: kv[1]=='Orientation', ExifTags.TAGS.items())

But it looks messy. Probably I will add const with some description.

bsekachev · 2022-03-30T09:16:33Z

cvat/apps/engine/media_extractors.py

@@ -90,13 +90,26 @@ def _get_preview(obj):
        else:
            preview = obj
        preview.thumbnail(PREVIEW_SIZE)
+        orientation = preview._getexif().get(274, 1) if preview._getexif() else 1
+        if orientation in [3, 4]:


The same comment about magic number, maybe to create a corresponding enumeration?

@ActiveChooN , I agree that it is not a good idea to use a private method. Please use the public API.

bsekachev · 2022-03-30T09:17:54Z

Does this patch work for context images?

ActiveChooN · 2022-03-31T10:11:20Z

@bsekachev

Does this patch work for context images?

Yeap

@bsekachev, @nmanovic, rewrote PR to prerotated images.

cvat/apps/engine/media_extractors.py

Co-authored-by: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>

bsekachev · 2022-04-01T10:54:41Z

I tried this patch using the archive below. Looks like there are issues when images are mirrored

EXIF_Orientation_Samples.zip

Windows image viewer is able to show such images correctly:

ActiveChooN · 2022-04-04T09:16:49Z

Looks like there are issues when images are mirrored

@bsekachev, fixed

cvat/apps/engine/media_extractors.py

nmanovic · 2022-04-04T12:00:53Z

utils/dataset_manifest/core.py

@@ -194,14 +194,18 @@ def __iter__(self):
            if idx in self.range_:
                image = next(sources)
                img = Image.open(image, mode='r')
+                orientation = img.getexif().get(274, 1)


@Marishka17 , probably you want to look at these changes and test them.

@nmanovic, Everything works fine.

cvat/apps/engine/media_extractors.py

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

ActiveChooN added 3 commits March 28, 2022 08:40

draft implementation

068f5fd

Added for non chunk

c349c1e

Added for chunks

b35abe4

ActiveChooN requested review from bsekachev and nmanovic as code owners March 29, 2022 08:19

ActiveChooN added 2 commits March 29, 2022 11:23

Added CHANGELOG increased packages version

cf41398

Merge branch 'develop' into dk/exif-orientation

5e1381c

nmanovic reviewed Mar 29, 2022

View reviewed changes

bsekachev reviewed Mar 30, 2022

View reviewed changes

ActiveChooN added 4 commits March 30, 2022 13:20

Added consts to server

051492e

Added comments for orientation

2b862f7

Use prerotated images

8799b2d

Fixed parsing sizes

16f128c

ActiveChooN requested a review from azhavoro as a code owner March 31, 2022 04:50

ActiveChooN added 2 commits March 31, 2022 11:57

Merge branch 'develop' into dk/exif-orientation

70d8895

Fixed missed method

b9b92d9

azhavoro reviewed Mar 31, 2022

View reviewed changes

cvat/apps/engine/media_extractors.py Outdated Show resolved Hide resolved

cvat/apps/engine/media_extractors.py Outdated Show resolved Hide resolved

cvat/apps/engine/media_extractors.py Outdated Show resolved Hide resolved

ActiveChooN and others added 2 commits April 1, 2022 09:12

Update cvat/apps/engine/media_extractors.py

19844e9

Co-authored-by: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>

Fixed comments

6af6b0b

azhavoro previously approved these changes Apr 1, 2022

View reviewed changes

Fixed orientation

99f9662

ActiveChooN dismissed azhavoro’s stale review via 99f9662 April 4, 2022 09:16

bsekachev previously approved these changes Apr 4, 2022

View reviewed changes

nmanovic reviewed Apr 4, 2022

View reviewed changes

cvat/apps/engine/media_extractors.py Outdated Show resolved Hide resolved

Update cvat/apps/engine/media_extractors.py

5b205cc

nmanovic dismissed bsekachev’s stale review via 5b205cc April 4, 2022 11:56

nmanovic reviewed Apr 4, 2022

View reviewed changes

nmanovic requested a review from Marishka17 April 4, 2022 12:01

Marishka17 previously approved these changes Apr 4, 2022

View reviewed changes

Update cvat/apps/engine/media_extractors.py

1b6e47b

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

ActiveChooN dismissed Marishka17’s stale review via 1b6e47b April 4, 2022 16:38

ActiveChooN and others added 5 commits April 4, 2022 19:38

Update cvat/apps/engine/media_extractors.py

d88853e

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

Update cvat/apps/engine/media_extractors.py

06d32b7

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

Update cvat/apps/engine/media_extractors.py

46f206a

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

Update cvat/apps/engine/media_extractors.py

f7dc27b

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

Update cvat/apps/engine/media_extractors.py

6330f5d

Co-authored-by: Maria Khrustaleva <maya17grd@gmail.com>

nmanovic approved these changes Apr 4, 2022

View reviewed changes

nmanovic merged commit d22b12d into develop Apr 4, 2022

nmanovic deleted the dk/exif-orientation branch April 4, 2022 17:49

themaikelman mentioned this pull request May 24, 2022

rotate_within_exif fails with image/tiff #4655

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EXIF orientation support #4529

EXIF orientation support #4529

ActiveChooN commented Mar 29, 2022 •

edited by azhavoro

Loading

nmanovic Mar 29, 2022

ActiveChooN Mar 30, 2022

bsekachev Mar 30, 2022

ActiveChooN Mar 30, 2022

bsekachev Mar 30, 2022

ActiveChooN Mar 30, 2022 •

edited

Loading

bsekachev Mar 30, 2022

nmanovic Mar 30, 2022

bsekachev commented Mar 30, 2022

ActiveChooN commented Mar 31, 2022

bsekachev commented Apr 1, 2022

ActiveChooN commented Apr 4, 2022

nmanovic Apr 4, 2022

Marishka17 Apr 4, 2022

EXIF orientation support #4529

EXIF orientation support #4529

Conversation

ActiveChooN commented Mar 29, 2022 • edited by azhavoro Loading

Motivation and context

How has this been tested?

Checklist

License

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ActiveChooN Mar 30, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bsekachev commented Mar 30, 2022

ActiveChooN commented Mar 31, 2022

bsekachev commented Apr 1, 2022

ActiveChooN commented Apr 4, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ActiveChooN commented Mar 29, 2022 •

edited by azhavoro

Loading

ActiveChooN Mar 30, 2022 •

edited

Loading