dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-01-27 15:12:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "FlattenSimilarBlocks should only be tried when blending is possible."

Browse Source
This commit is contained in:
pascal massimino 2014-11-05 14:19:40 -08:00 committed by Gerrit Code Review
commit 11a25f75bd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/gif2webp_util.c
View File

@ -674,11 +674,9 @@ static WebPEncodingError GenerateCandidates(
} }
} }
if (candidate_lossy->evaluate) { if (candidate_lossy->evaluate) {
if (!is_key_frame) { if (use_blending) {
// For lossy compression of a frame, it's better to: // For lossy compression of a frame, it's better to replace similar blocks
// * Replace transparent pixels of 'curr' with actual RGB values, // of pixels by a transparent block.
// whenever possible, and
// * Replace similar blocks of pixels by a transparent block.
if (!curr_canvas_saved) { // save if not already done so. if (!curr_canvas_saved) { // save if not already done so.
CopyPixels(curr_canvas, curr_canvas_tmp); CopyPixels(curr_canvas, curr_canvas_tmp);
} }
@ -687,7 +685,7 @@ static WebPEncodingError GenerateCandidates(
error_code = EncodeCandidate(sub_frame, rect, config_lossy, use_blending, error_code = EncodeCandidate(sub_frame, rect, config_lossy, use_blending,
duration, candidate_lossy); duration, candidate_lossy);
if (error_code != VP8_ENC_OK) return error_code; if (error_code != VP8_ENC_OK) return error_code;
if (!is_key_frame) { if (use_blending) {
CopyPixels(curr_canvas_tmp, curr_canvas); // restore CopyPixels(curr_canvas_tmp, curr_canvas); // restore
} }
} }