Thumbnailer

Merge lp://staging/~jamesh/thumbnailer/gif-first-frame into lp://staging/thumbnailer/devel

gif-first-frame
Merge into devel

Proposed by James Henstridge on 2016-01-19

Status:

Merged

Approved by:

Michi Henning on 2016-01-20

Approved revision:

346

Merged at revision:

340

Proposed branch:

lp://staging/~jamesh/thumbnailer/gif-first-frame

Merge into:

lp://staging/thumbnailer/devel

Diff against target:

195 lines (+68/-40)

4 files modified

src/image.cpp (+25/-4)
src/thumbnailer.cpp (+0/-24)
tests/image/image_test.cpp (+37/-0)
tests/thumbnailer/thumbnailer_test.cpp (+6/-12)

To merge this branch:

bzr merge lp://staging/~jamesh/thumbnailer/gif-first-frame

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michi Henning (community)		2016-01-19	Approve on 2016-01-20
PS Jenkins bot (community)	continuous-integration		Approve on 2016-01-20
Review via email: mp+283175@code.staging.launchpad.net

Commit message

When reading a potentially animated image, stop processing chunks once we've fully decoded the first frame. This reduces the IO and CPU load when thumbnailing large animated GIF files.

Description of the change

When reading a potentially animated image, stop processing chunks once we've fully decoded the first frame. This reduces the IO and CPU load when thumbnailing large animated GIF files.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-19:

PASSED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/642/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/347
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/642/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-19:

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/643/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/348
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/643/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michi Henning (michihenning) wrote on 2016-01-19:

Very nice, thank you!

review: Approve

Revision history for this message

James Henstridge (jamesh) wrote on 2016-01-19:

It seems that loading plus scaling stops this from working, leading to the entire animation being loaded.

lp://staging/~jamesh/thumbnailer/gif-first-frame updated on 2016-01-19

344. By James Henstridge on 2016-01-19: Add a test for loading a scaled animated gif.
345. By James Henstridge on 2016-01-19: When loading a scaled animation, the area-prepared signal may be delayed
until the loader is closed. So instead, try to create the
PixbufAnimationIter after feeding each chunk to the loader.
346. By James Henstridge on 2016-01-19: Simplify logic a little.