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

AnimEncoder lib cleanup: prev to prev canvas not needed.

Browse Source 
Given that we decided to only handle frame disposal for output WebP
internally,
only current and previous canvas need to be maintained.

Change-Id: I625293bed5aeb5aabf4eca779f6ec3ee84c9ff2a
This commit is contained in:
Urvang Joshi 2015-01-06 16:22:29 -08:00
parent 4b997ae46d
commit ae1c046e12
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux/anim_encode.c
View File

@ -46,7 +46,6 @@ struct WebPAnimEncoder {
WebPPicture curr_canvas_mod_; // Possibly modified current canvas. WebPPicture curr_canvas_mod_; // Possibly modified current canvas.
WebPPicture prev_canvas_; // Previous canvas. WebPPicture prev_canvas_; // Previous canvas.
WebPPicture prev_canvas_disposed_; // Previous canvas disposed to background. WebPPicture prev_canvas_disposed_; // Previous canvas disposed to background.
WebPPicture prev_to_prev_canvas_; // Previous to previous canvas.
// Encoded data. // Encoded data.
EncodedFrame* encoded_frames_; // Array of encoded frames. EncodedFrame* encoded_frames_; // Array of encoded frames.
@ -204,8 +203,7 @@ WebPAnimEncoder* WebPAnimEncoderNewInternal(
// Canvas buffers. // Canvas buffers.
if (!WebPPictureInit(&enc->curr_canvas_mod_) || if (!WebPPictureInit(&enc->curr_canvas_mod_) ||
!WebPPictureInit(&enc->prev_canvas_) || !WebPPictureInit(&enc->prev_canvas_) ||
!WebPPictureInit(&enc->prev_canvas_disposed_) || !WebPPictureInit(&enc->prev_canvas_disposed_)) {
!WebPPictureInit(&enc->prev_to_prev_canvas_)) {
return NULL; return NULL;
} }
enc->curr_canvas_mod_.width = width; enc->curr_canvas_mod_.width = width;
@ -213,12 +211,10 @@ WebPAnimEncoder* WebPAnimEncoderNewInternal(
enc->curr_canvas_mod_.use_argb = 1; enc->curr_canvas_mod_.use_argb = 1;
if (!WebPPictureAlloc(&enc->curr_canvas_mod_) || if (!WebPPictureAlloc(&enc->curr_canvas_mod_) ||
!WebPPictureCopy(&enc->curr_canvas_mod_, &enc->prev_canvas_) || !WebPPictureCopy(&enc->curr_canvas_mod_, &enc->prev_canvas_) ||
!WebPPictureCopy(&enc->curr_canvas_mod_, &enc->prev_canvas_disposed_) || !WebPPictureCopy(&enc->curr_canvas_mod_, &enc->prev_canvas_disposed_)) {
!WebPPictureCopy(&enc->curr_canvas_mod_, &enc->prev_to_prev_canvas_)) {
goto Err; goto Err;
} }
WebPUtilClearPic(&enc->prev_canvas_, NULL); WebPUtilClearPic(&enc->prev_canvas_, NULL);
WebPUtilClearPic(&enc->prev_to_prev_canvas_, NULL);
// Encoded frames. // Encoded frames.
ResetCounters(enc); ResetCounters(enc);
@ -256,7 +252,6 @@ void WebPAnimEncoderDelete(WebPAnimEncoder* enc) {
WebPPictureFree(&enc->curr_canvas_mod_); WebPPictureFree(&enc->curr_canvas_mod_);
WebPPictureFree(&enc->prev_canvas_); WebPPictureFree(&enc->prev_canvas_);
WebPPictureFree(&enc->prev_canvas_disposed_); WebPPictureFree(&enc->prev_canvas_disposed_);
WebPPictureFree(&enc->prev_to_prev_canvas_);
if (enc->encoded_frames_ != NULL) { if (enc->encoded_frames_ != NULL) {
size_t i; size_t i;
for (i = 0; i < enc->size_; ++i) { for (i = 0; i < enc->size_; ++i) {
@ -966,7 +961,6 @@ static int CacheFrame(WebPAnimEncoder* const enc, int duration,
} }
// Update previous to previous and previous canvases for next call. // Update previous to previous and previous canvases for next call.
CopyPixels(&enc->prev_canvas_, &enc->prev_to_prev_canvas_);
CopyPixels(enc->curr_canvas_, &enc->prev_canvas_); CopyPixels(enc->curr_canvas_, &enc->prev_canvas_);
enc->is_first_frame_ = 0; enc->is_first_frame_ = 0;
ok = 1; ok = 1;