Fix #107212: Fix file browser thumbnails for images #107231

Jesse Yurkovich · 2023-04-22T03:05:09+02:00

Jesse Yurkovich commented

2023-04-22 03:05:09 +02:00

Change to using the OIIO .valid_file(filepath) API to implement the
is_a_* checks. The existing code to only try parsing 64-bytes doesn't
work in all cases with the .open API. This unfortunately requires a
new is_a_from_file callback to be defined to feed in the filename
because .valid_file does not have an overload for memory proxies.

The .valid_file call should be more efficient than .open as it will
often just check the headers, like we used to do before, rather than
attempt more work as is sometimes the case.

This was missed during development because Blender will cache thumbnails
into a special .thumbnails directory and the images I was using to test
had already been cached there.

The current is_a check fails for thumbnails because they are fed small 64-byte buffers and the usage of OIIO's .open sometimes requires more than that to succeed. Packing is unaffected since the complete memory buffer is provided. Only in the case of thumbnails do we read just a small portion of the file leading to the issue. Unfortunately increasing this buffer to 4096 doesn't fix all files I've tested. I did not try something even larger.

I plan to work on a PR for OIIO to allow .valid_file to take in a memory proxy. If that is accepted we should be able to remove the need to have the is_a_from_file callback.

Change to using the OIIO `.valid_file(filepath)` API to implement the `is_a_*` checks. The existing code to only try parsing 64-bytes doesn't work in all cases with the `.open` API. This unfortunately requires a new `is_a_from_file` callback to be defined to feed in the filename because `.valid_file` does not have an overload for memory proxies. The `.valid_file` call should be more efficient than `.open` as it will often just check the headers, like we used to do before, rather than attempt more work as is sometimes the case. This was missed during development because Blender will cache thumbnails into a special .thumbnails directory and the images I was using to test had already been cached there. ---- The current `is_a` check fails for thumbnails because they are fed small 64-byte buffers and the usage of OIIO's `.open` sometimes requires more than that to succeed. Packing is unaffected since the complete memory buffer is provided. Only in the case of thumbnails do we read just a small portion of the file leading to the issue. Unfortunately increasing this buffer to 4096 doesn't fix all files I've tested. I did not try something even larger. I plan to work on a PR for OIIO to allow `.valid_file` to take in a memory proxy. If that is accepted we should be able to remove the need to have the `is_a_from_file` callback.

Jesse Yurkovich added 1 commit 2023-04-22 03:05:18 +02:00

buildbot/vexp-code-patch-coordinator Build done. Details

8f3f3d131a Fix 107212: Fix file browser thumbnails for images

Jesse Yurkovich commented

2023-04-22 03:06:56 +02:00

@blender-bot build

Jesse Yurkovich changed title from ~~WIP: Fix 107212: Fix file browser thumbnails for images~~ to Fix 107212: Fix file browser thumbnails for images

2023-04-22 04:24:01 +02:00

Jesse Yurkovich added this to the Core project 2023-04-22 04:24:59 +02:00

Jesse Yurkovich changed title from ~~Fix 107212: Fix file browser thumbnails for images~~ to Fix #107212: Fix file browser thumbnails for images

2023-04-26 02:13:19 +02:00

Jesse Yurkovich commented

2023-04-26 05:23:32 +02:00

After researching some more, there's another, much less invasive, fix that seems to work for the files I have locally:

Change the 64 byte buffer to 2048
Recreate the very small manual is_a check for TIFF that was present before OIIO

I'd still work towards getting the memory proxy support added for OIIO regardless.

After researching some more, there's another, much less invasive, fix that seems to work for the files I have locally: - Change the 64 byte buffer to 2048 - Recreate the very small manual is_a check for TIFF that was present before OIIO I'd still work towards getting the memory proxy support added for OIIO regardless.

Jesse Yurkovich commented

2023-04-27 07:46:47 +02:00

Will redo this change to be smaller and more isolated

Jesse Yurkovich closed this pull request

2023-04-27 07:46:48 +02:00

Bastien Montagne removed this from the Core project 2023-07-03 12:46:28 +02:00

buildbot/vexp-code-patch-coordinator Build done.

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

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 #107212: Fix file browser thumbnails for images #107231

Pull request closed