Fix #107493: Auto rotate videos fix #115661

ErikHK · 2023-12-01T12:34:12+01:00

ErikHK commented

2023-12-01 12:34:12 +01:00

First-time contributor

This fixes the bug where Blender doesn't take video rotation into account when importing videos. iPhone videos recorded in portrait mode for example will be in the wrong rotation when imported into Blender. I've only covered the cases where rotation is equal to -90, 180 or -180 degrees, there might be other variations from other cameras, like 270, or 90 degrees. If someone has example videos like these, please upload them!
Also the 180 and -180 degree cases can be improved, now they're done through an x flip followed by a y flip.

Other similar bug reports: #108478 and #98480

This fixes the bug where Blender doesn't take video rotation into account when importing videos. iPhone videos recorded in portrait mode for example will be in the wrong rotation when imported into Blender. I've only covered the cases where rotation is equal to -90, 180 or -180 degrees, there might be other variations from other cameras, like 270, or 90 degrees. If someone has example videos like these, please upload them! Also the 180 and -180 degree cases can be improved, now they're done through an x flip followed by a y flip. Other similar bug reports: #108478 and #98480

ErikHK added 4 commits 2023-12-01 12:34:27 +01:00

546b4f4d18 added files

0698040cb3 readded file I accidentally removed.... I think

f82e9771ab fixed 180 degree rotation too

da3b49c716 cleaned up

ErikHK added 1 commit 2023-12-01 12:44:30 +01:00

98bf8c3e95 formatted code with make format

ErikHK added 1 commit 2023-12-01 12:51:00 +01:00

61f65b290c more cleanup

Iliya Katushenock added the

Module

VFX & Video

label 2023-12-01 12:51:27 +01:00

Falk David requested review from Sergey Sharybin 2023-12-01 12:54:24 +01:00

Iliya Katushenock added this to the Core Libraries project 2023-12-01 15:01:10 +01:00

Iliya Katushenock modified the project from Core Libraries to Core

2023-12-01 15:01:16 +01:00

Sergey Sharybin requested changes 2023-12-01 15:27:22 +01:00

Sergey Sharybin left a comment

Thanks for the PR.

There are some in-lined comments with points which needs to be addressed.

Outside of the inlined comments the note is that functions in the processing functions in imbuf should be handling both byte and float buffer. Similar to IMB_flipx (but do not assume 4 channel for float, use ibuf->channels instead).

Thanks for the PR. There are some in-lined comments with points which needs to be addressed. Outside of the inlined comments the note is that functions in the processing functions in imbuf should be handling both byte and float buffer. Similar to `IMB_flipx` (but do not assume 4 channel for float, use ibuf->channels instead).

source/blender/imbuf/intern/anim_movie.cc Outdated

						
				@ -878,0 +886,4 @@

				  if (displaymatrix == nullptr)

				    return;

				  double theta = 0;

Sergey Sharybin commented

2023-12-01 15:03:23 +01:00

const double theta = av_display_rotation_get((int32_t *)displaymatrix);

`const double theta = av_display_rotation_get((int32_t *)displaymatrix);`

ErikHK marked this conversation as resolved

source/blender/imbuf/intern/rotate.cc

						
				@ -111,0 +112,4 @@

				void IMB_rotate90(ImBuf *ibuf)

				{

				  ImBuf *tbuf;

				  int x, y;

Sergey Sharybin commented

2023-12-01 15:14:05 +01:00

Reduce the scope of variables. So instead of defining them in the beginning of the function define close to where you use htem. Examples:

ImBuf *tbuf = IMB_allocImBuf(ibuf->y, ibuf->x, 32, IB_rect);
for (int y = tbuf->y - 1; y >= 0; y--) {

Reduce the scope of variables. So instead of defining them in the beginning of the function define close to where you use htem. Examples: - `ImBuf *tbuf = IMB_allocImBuf(ibuf->y, ibuf->x, 32, IB_rect);` - `for (int y = tbuf->y - 1; y >= 0; y--) {`

ErikHK marked this conversation as resolved

source/blender/imbuf/intern/rotate.cc Outdated

						
				@ -111,0 +118,4 @@

				  ibufrect = (uint *)ibuf->byte_buffer.data;

				  if (ibuf == 0)

Sergey Sharybin commented

2023-12-01 15:15:54 +01:00

nullptr instead of 0.

`nullptr` instead of `0`.

ErikHK marked this conversation as resolved

source/blender/imbuf/intern/rotate.cc Outdated

						
				@ -111,0 +123,4 @@

				  if (ibufrect == 0)

				    return;

				  tbuf = IMB_allocImBuf(ibuf->y, ibuf->x, 32, IB_rect);

Sergey Sharybin commented

2023-12-01 15:15:42 +01:00

You can duplicate just the data, and use that as a const-source , and write the rotated result directly to the ibuf->byte_buffer. This way you wouldn't need the extra memcpy after the loop.

You can duplicate just the data, and use that as a const-source , and write the rotated result directly to the `ibuf->byte_buffer`. This way you wouldn't need the extra `memcpy` after the loop.

ErikHK commented

2023-12-02 15:58:03 +01:00

First-time contributor

Thanks for the tip! I think I solved it in the way you suggested, but since I'm not great at memory handling and stuff in C it would be nice if you could take a look at it :)

ErikHK added 1 commit 2023-12-02 15:55:30 +01:00

68f1246785 fixed code according to comments

ErikHK commented

2023-12-02 15:59:49 +01:00

First-time contributor

Thanks for the PR.

There are some in-lined comments with points which needs to be addressed.

Outside of the inlined comments the note is that functions in the processing functions in imbuf should be handling both byte and float buffer. Similar to IMB_flipx (but do not assume 4 channel for float, use ibuf->channels instead).

I don't really know how to fix that since I don't know when images have float values and/instead of byte values. Do you know any way to try this out?

> Thanks for the PR. > > There are some in-lined comments with points which needs to be addressed. > > Outside of the inlined comments the note is that functions in the processing functions in imbuf should be handling both byte and float buffer. Similar to `IMB_flipx` (but do not assume 4 channel for float, use ibuf->channels instead). I don't really know how to fix that since I don't know when images have float values and/instead of byte values. Do you know any way to try this out?

Sergey Sharybin commented

2024-01-09 12:45:59 +01:00

I don't really know how to fix that since I don't know when images have float values and/instead of byte values. Do you know any way to try this out?

Potentially ImBuf could have none of buffers, only only one of the byte or float buffer, or even both.

I think the simplest way to trigger the float buffer code path for the development purposes of this patch would be to:

  IMB_float_from_rect();
  imb_freerectImBuf();

  IMB_rotate90();  

  IMB_rect_from_float();
  imb_freerectfloatImBuf();

We could also expose the rotation as an operator to the image editor, which will implement functionallity like "Rotate 90 degrees CW", "Rotate 90 degreed CCW", and then you'll have a visual confirmation that the algorithm works quite easily, and you'll be able to easily control which data is coming it. But in a way, this is outside of the scope of this PR.

> I don't really know how to fix that since I don't know when images have float values and/instead of byte values. Do you know any way to try this out? Potentially ImBuf could have none of buffers, only only one of the byte or float buffer, or even both. I think the simplest way to trigger the float buffer code path for the development purposes of this patch would be to: ``` IMB_float_from_rect(); imb_freerectImBuf(); IMB_rotate90(); IMB_rect_from_float(); imb_freerectfloatImBuf(); ```` We could also expose the rotation as an operator to the image editor, which will implement functionallity like "Rotate 90 degrees CW", "Rotate 90 degreed CCW", and then you'll have a visual confirmation that the algorithm works quite easily, and you'll be able to easily control which data is coming it. But in a way, this is outside of the scope of this PR.

Aras Pranckevicius referenced this pull request

2024-01-20 08:40:22 +01:00

UI: Image Rotate #117352

This pull request has changes conflicting with the target branch.

source/blender/imbuf/IMB_imbuf.h

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u auto_rotate_video:ErikHK-auto_rotate_video

git checkout ErikHK-auto_rotate_video

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #107493: Auto rotate videos fix #115661

Checkout