dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-03 15:36:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

WebPAnimEncoder: Fix for single-frame optimization.

Browse Source 
Change-Id: I2da8dc34ab9589b58cde0ecb05d71357d77f6b25
This commit is contained in:
Urvang Joshi 2016-04-15 12:10:07 -07:00
parent 602f344a36
commit 6e12e1e3d2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux/anim_encode.c
View File

@ -51,8 +51,10 @@ struct WebPAnimEncoder {
FrameRect prev_rect_; // Previous WebP frame rectangle. FrameRect prev_rect_; // Previous WebP frame rectangle.
WebPConfig last_config_; // Cached in case a re-encode is needed. WebPConfig last_config_; // Cached in case a re-encode is needed.
WebPConfig last_config2_; // 2nd cached config; only valid if WebPConfig last_config_reversed_; // If 'last_config_' uses lossless, then
// 'options_.allow_mixed' is true. // this config uses lossy and vice versa;
// only valid if 'options_.allow_mixed'
// is true.
WebPPicture* curr_canvas_; // Only pointer; we don't own memory. WebPPicture* curr_canvas_; // Only pointer; we don't own memory.
@ -1095,7 +1097,7 @@ static WebPEncodingError SetFrame(WebPAnimEncoder* const enc,
config_ll.lossless = 1; config_ll.lossless = 1;
config_lossy.lossless = 0; config_lossy.lossless = 0;
enc->last_config_ = *config; enc->last_config_ = *config;
enc->last_config2_ = config->lossless ? config_lossy : config_ll; enc->last_config_reversed_ = config->lossless ? config_lossy : config_ll;
*frame_skipped = 0; *frame_skipped = 0;
if (!SubFrameParamsInit(&dispose_none_params, 1, empty_rect_allowed_none) || if (!SubFrameParamsInit(&dispose_none_params, 1, empty_rect_allowed_none) ||
@ -1445,7 +1447,7 @@ static int FrameToFullCanvas(WebPAnimEncoder* const enc,
GetEncodedData(&mem1, full_image); GetEncodedData(&mem1, full_image);
if (enc->options_.allow_mixed) { if (enc->options_.allow_mixed) {
if (!EncodeFrame(&enc->last_config_, canvas_buf, &mem2)) goto Err; if (!EncodeFrame(&enc->last_config_reversed_, canvas_buf, &mem2)) goto Err;
if (mem2.size < mem1.size) { if (mem2.size < mem1.size) {
GetEncodedData(&mem2, full_image); GetEncodedData(&mem2, full_image);
WebPMemoryWriterClear(&mem1); WebPMemoryWriterClear(&mem1);