generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AnimEncoder: Correctly skip a frame when sub-rectangle is empty.

Browse Source 
Change-Id: I0d288bd9561b48cf5a1eae92a1b7106ba44c664e
(cherry picked from commit 1cc79e92ac)
This commit is contained in:
Hui Su 2016-12-02 11:48:28 +01:00 committed by James Zern
parent 408858308a
commit be7dcc088c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mux/anim_encode.c
View File

@ -1029,6 +1029,8 @@ static WebPEncodingError SetFrame(WebPAnimEncoder* const enc,
const WebPPicture* const prev_canvas = &enc->prev_canvas_; const WebPPicture* const prev_canvas = &enc->prev_canvas_;
Candidate candidates[CANDIDATE_COUNT]; Candidate candidates[CANDIDATE_COUNT];
const int is_lossless = config->lossless; const int is_lossless = config->lossless;
const int consider_lossless = is_lossless || enc->options_.allow_mixed;
const int consider_lossy = !is_lossless || enc->options_.allow_mixed;
const int is_first_frame = enc->is_first_frame_; const int is_first_frame = enc->is_first_frame_;
// First frame cannot be skipped as there is no 'previous frame' to merge it // First frame cannot be skipped as there is no 'previous frame' to merge it
@ -1077,8 +1079,8 @@ static WebPEncodingError SetFrame(WebPAnimEncoder* const enc,
goto Err; goto Err;
} }
if ((is_lossless && IsEmptyRect(&dispose_none_params.rect_ll_)) || if ((consider_lossless && IsEmptyRect(&dispose_none_params.rect_ll_)) ||
(!is_lossless && IsEmptyRect(&dispose_none_params.rect_lossy_))) { (consider_lossy && IsEmptyRect(&dispose_none_params.rect_lossy_))) {
// Don't encode the frame at all. Instead, the duration of the previous // Don't encode the frame at all. Instead, the duration of the previous
// frame will be increased later. // frame will be increased later.
assert(empty_rect_allowed_none); assert(empty_rect_allowed_none);