Details

Reviewers

Maniphest Tasks

T90908: Improve thumbnail loading from blend files.

Commits

rB0fd1e6a5f43d: T90908: Reduce loading times when extracting thumbnails from Blendfiles.

Summary

Previously when loading an thumbnails for an asset the whole file was
read. Reason this was done was perhaps a future idea to load
all thumbnails inside a blendfile in a single go. This was never implemented
and currently unneeded disk and cpu cycles was spend with finding out what
preview to load.

This patch adds an early break when the thumbnail that the caller is
interested in has been found. This improves the thumbnail extraction
when looking into large files.

Diff Detail

Repository: rB Blender

Event Timeline

Jeroen Bakker (jbakker) created this revision.Aug 25 2021, 11:04 AM

Harbormaster completed remote builds in B16605: Diff 41073.Aug 25 2021, 11:04 AM

Updated comments.

Harbormaster completed remote builds in B16606: Diff 41074.Aug 25 2021, 11:07 AM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Aug 25 2021, 11:09 AM

Jeroen Bakker (jbakker) added a reviewer: Bastien Montagne (mont29).

Jeroen Bakker (jbakker) added a project: Asset Browser.

Shuffled code to reduce the number of unclear exist.

Harbormaster completed remote builds in B16607: Diff 41075.Aug 25 2021, 11:20 AM

Jeroen Bakker (jbakker) requested review of this revision.Aug 25 2021, 11:21 AM

Jeroen Bakker (jbakker) retitled this revision from Partial T90908: Reduce full fill read when loading thumbnails. to T90908: Reduce loading times when extracting thumbnails from Blendfiles..

Jeroen Bakker (jbakker) mentioned this in T90908: Improve thumbnail loading from blend files..

Renamed to BLO_blendhandle_get_preview_for_id

Harbormaster completed remote builds in B16608: Diff 41076.Aug 25 2021, 11:28 AM

Jeroen Bakker (jbakker) planned changes to this revision.Aug 25 2021, 11:56 AM

Jeroen Bakker (jbakker) added inline comments.

source/blender/blenloader/BLO_readfile.h
174	We should keep the old implementation as I am tempted to redoing the thumbcache.

Reverted back the old behavior and added the new behavior next to it.

Harbormaster completed remote builds in B16611: Diff 41079.Aug 25 2021, 12:01 PM

Generally LGTM, just really think the loop over preview indices (for the different sizes) should be part of the helper reading func.

source/blender/blenloader/intern/readblenentry.c
225–231	This is very confusing, and a nice source of bugs, since signature of the function hints that it can randomly access a given `preview_index`, when this code can only even work once and with proper sequential `preview_index`. The loop over `preview_index` values should be done in this helper. And comment should make it clears that the `bhead` is 'consumed' too.
268	`preview_from_file == NULL`

This revision now requires changes to proceed.Aug 25 2021, 12:42 PM

Moved forloop into helper function.

Harbormaster completed remote builds in B16612: Diff 41080.Aug 25 2021, 2:16 PM

Jeroen Bakker (jbakker) marked 2 inline comments as done.Aug 25 2021, 2:16 PM

LGTM

This revision is now accepted and ready to land.Aug 25 2021, 3:09 PM

Closed by commit rB0fd1e6a5f43d: T90908: Reduce loading times when extracting thumbnails from Blendfiles. (authored by Jeroen Bakker (jbakker)). · Explain WhyAug 25 2021, 4:01 PM

This revision was automatically updated to reflect the committed changes.

Jeroen Bakker (jbakker) added a commit: rB0fd1e6a5f43d: T90908: Reduce loading times when extracting thumbnails from Blendfiles..

T90908: Reduce loading times when extracting thumbnails from Blendfiles.
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 41089

source/blender/blenloader/BLO_readfile.h

source/blender/blenloader/intern/readblenentry.c

source/blender/imbuf/intern/thumbs_blend.c

T90908: Reduce loading times when extracting thumbnails from Blendfiles.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 41089

source/blender/blenloader/BLO_readfile.h

source/blender/blenloader/intern/readblenentry.c

source/blender/imbuf/intern/thumbs_blend.c

T90908: Reduce loading times when extracting thumbnails from Blendfiles.
ClosedPublic
Actions

Revision Contents
Changeset List