mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Have example/gifplayer use frame background colors
This commit is contained in:
1 parent
cf26b93f2f
commit
1e4f86cfa0
1 file changed
+14
-12
@@ -100,7 +100,6 @@ wuffs_base__slice_u8 workbuf = {0};
|
|||||||
wuffs_base__slice_u8 printbuf = {0};
|
wuffs_base__slice_u8 printbuf = {0};
|
||||||
|
|
||||||
bool first_play = true;
|
bool first_play = true;
|
||||||
wuffs_base__color_u32_argb_premul background_color = 0;
|
|
||||||
uint32_t num_loops_remaining = 0;
|
uint32_t num_loops_remaining = 0;
|
||||||
wuffs_base__pixel_buffer pb = {0};
|
wuffs_base__pixel_buffer pb = {0};
|
||||||
|
|
||||||
@@ -140,7 +139,8 @@ static inline uint32_t load_u32le(uint8_t* p) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void restore_background(wuffs_base__pixel_buffer* pb,
|
void restore_background(wuffs_base__pixel_buffer* pb,
|
||||||
wuffs_base__rect_ie_u32 bounds) {
|
wuffs_base__rect_ie_u32 bounds,
|
||||||
|
wuffs_base__color_u32_argb_premul background_color) {
|
||||||
size_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
size_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
||||||
size_t y;
|
size_t y;
|
||||||
for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) {
|
for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) {
|
||||||
@@ -323,7 +323,6 @@ const char* play() {
|
|||||||
}
|
}
|
||||||
uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg);
|
uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg);
|
||||||
uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg);
|
uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg);
|
||||||
background_color = wuffs_base__image_config__background_color(&ic);
|
|
||||||
if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) {
|
if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) {
|
||||||
return "image dimensions are too large";
|
return "image dimensions are too large";
|
||||||
}
|
}
|
||||||
@@ -344,14 +343,6 @@ const char* play() {
|
|||||||
memset(pixbuf.ptr, 0, pixbuf.len);
|
memset(pixbuf.ptr, 0, pixbuf.len);
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
size_t n = dst_len / sizeof(wuffs_base__color_u32_argb_premul);
|
|
||||||
for (i = 0; i < n; i++) {
|
|
||||||
curr_dst_buffer[i] = background_color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
wuffs_base__frame_config fc = {0};
|
wuffs_base__frame_config fc = {0};
|
||||||
wuffs_base__status status =
|
wuffs_base__status status =
|
||||||
@@ -363,6 +354,16 @@ const char* play() {
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (wuffs_base__frame_config__index(&fc) == 0) {
|
||||||
|
wuffs_base__color_u32_argb_premul background_color =
|
||||||
|
wuffs_base__frame_config__background_color(&fc);
|
||||||
|
size_t i;
|
||||||
|
size_t n = dst_len / sizeof(wuffs_base__color_u32_argb_premul);
|
||||||
|
for (i = 0; i < n; i++) {
|
||||||
|
curr_dst_buffer[i] = background_color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (wuffs_base__frame_config__disposal(&fc)) {
|
switch (wuffs_base__frame_config__disposal(&fc)) {
|
||||||
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS: {
|
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS: {
|
||||||
memcpy(prev_dst_buffer, curr_dst_buffer, dst_len);
|
memcpy(prev_dst_buffer, curr_dst_buffer, dst_len);
|
||||||
@@ -385,7 +386,8 @@ const char* play() {
|
|||||||
|
|
||||||
switch (wuffs_base__frame_config__disposal(&fc)) {
|
switch (wuffs_base__frame_config__disposal(&fc)) {
|
||||||
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND: {
|
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND: {
|
||||||
restore_background(&pb, wuffs_base__frame_config__bounds(&fc));
|
restore_background(&pb, wuffs_base__frame_config__bounds(&fc),
|
||||||
|
wuffs_base__frame_config__background_color(&fc));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS: {
|
case WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS: {
|
||||||
|
|||||||
Reference in new issue
Block a user