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

vwebp: Fix bug when Dispose then NoBlend frames

Browse Source 
The graphical bug happens when there is a frame disposed to background
color, followed by another frame that does not blend, and their areas
don't fully overlap. Only the previous frame clears its part of the
viewport. The fix consists in clearing the screen for the previous and
the current frame if needed.

Change-Id: I3425cf7297f0c7b2cf13a3a61b517cc0b1c031d8
This commit is contained in:
Yannis Guyon 2018-07-23 17:50:33 +00:00 committed by James Zern
parent 423f257930
commit 009562b403
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
examples/vwebp.c
View File

@ -334,6 +334,24 @@ static void DrawBackground(void) {
} }
} }
// Draw background in a scissored rectangle.
static void DrawBackgroundScissored(int window_x, int window_y, int frame_w,
int frame_h) {
// Only update the requested area, not the whole canvas.
window_x = window_x * kParams.viewport_width / kParams.canvas_width;
window_y = window_y * kParams.viewport_height / kParams.canvas_height;
frame_w = frame_w * kParams.viewport_width / kParams.canvas_width;
frame_h = frame_h * kParams.viewport_height / kParams.canvas_height;
// glScissor() takes window coordinates (0,0 at bottom left).
window_y = kParams.viewport_height - window_y - frame_h;
glEnable(GL_SCISSOR_TEST);
glScissor(window_x, window_y, frame_w, frame_h);
DrawBackground();
glDisable(GL_SCISSOR_TEST);
}
static void HandleDisplay(void) { static void HandleDisplay(void) {
const WebPDecBuffer* const pic = kParams.pic; const WebPDecBuffer* const pic = kParams.pic;
const WebPIterator* const curr = &kParams.curr_frame; const WebPIterator* const curr = &kParams.curr_frame;
@ -351,36 +369,20 @@ static void HandleDisplay(void) {
if (kParams.only_deltas) { if (kParams.only_deltas) {
DrawBackground(); DrawBackground();
} else if (prev->dispose_method == WEBP_MUX_DISPOSE_BACKGROUND || } else {
curr->blend_method == WEBP_MUX_NO_BLEND) { // The rectangle of the previous frame might be different than the current
// glScissor() takes window coordinates (0,0 at bottom left). // frame, so we may need to DrawBackgroundScissored for both.
int window_x, window_y;
int frame_w, frame_h;
if (prev->dispose_method == WEBP_MUX_DISPOSE_BACKGROUND) { if (prev->dispose_method == WEBP_MUX_DISPOSE_BACKGROUND) {
// Clear the previous frame rectangle. // Clear the previous frame rectangle.
window_x = prev->x_offset; DrawBackgroundScissored(prev->x_offset, prev->y_offset, prev->width,
window_y = kParams.canvas_height - prev->y_offset - prev->height; prev->height);
frame_w = prev->width; }
frame_h = prev->height; if (curr->blend_method == WEBP_MUX_NO_BLEND) {
} else { // curr->blend_method == WEBP_MUX_NO_BLEND. // We simulate no-blending behavior by first clearing the current frame
// We simulate no-blending behavior by first clearing the current frame // rectangle and then alpha-blending against it.
// rectangle (to a checker-board) and then alpha-blending against it. DrawBackgroundScissored(curr->x_offset, curr->y_offset, curr->width,
window_x = curr->x_offset; curr->height);
window_y = kParams.canvas_height - curr->y_offset - curr->height;
frame_w = curr->width;
frame_h = curr->height;
} }
glEnable(GL_SCISSOR_TEST);
// Only update the requested area, not the whole canvas.
window_x = window_x * kParams.viewport_width / kParams.canvas_width;
window_y = window_y * kParams.viewport_height / kParams.canvas_height;
frame_w = frame_w * kParams.viewport_width / kParams.canvas_width;
frame_h = frame_h * kParams.viewport_height / kParams.canvas_height;
glScissor(window_x, window_y, frame_w, frame_h);
DrawBackground();
glDisable(GL_SCISSOR_TEST);
} }
*prev = *curr; *prev = *curr;