mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor pgn_reverse_filter_wrapper

Browse Source
This commit is contained in:
twinaphex 2015-02-26 19:45:25 +01:00
parent 4d9eb3f8d8
commit bb02411544
1 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
libretro-common/formats/png/rpng_decode_common.h
View File

@ -133,8 +133,11 @@ static int png_reverse_filter_wrapper(uint32_t *data, const struct png_ihdr *ihd
const uint8_t *inflate_buf, struct rpng_process_t *pngp, const uint8_t *inflate_buf, struct rpng_process_t *pngp,
const uint32_t *palette) const uint32_t *palette)
{ {
unsigned i; unsigned i, filter;
bool cont = pngp->h < ihdr->height; bool cont;
begin:
cont = pngp->h < ihdr->height;
if (!cont) if (!cont)
{ {
@ -142,86 +145,79 @@ static int png_reverse_filter_wrapper(uint32_t *data, const struct png_ihdr *ihd
return 1; return 1;
} }
do filter = *inflate_buf++;
switch (filter)
{ {
unsigned filter; case 0: /* None */
memcpy(pngp->decoded_scanline, inflate_buf, pngp->pitch);
if (pngp->h < ihdr->height) {}
else
break; break;
filter = *inflate_buf++; case 1: /* Sub */
for (i = 0; i < pngp->bpp; i++)
pngp->decoded_scanline[i] = inflate_buf[i];
for (i = pngp->bpp; i < pngp->pitch; i++)
pngp->decoded_scanline[i] = pngp->decoded_scanline[i - pngp->bpp] + inflate_buf[i];
break;
switch (filter) case 2: /* Up */
{ for (i = 0; i < pngp->pitch; i++)
case 0: /* None */ pngp->decoded_scanline[i] = pngp->prev_scanline[i] + inflate_buf[i];
memcpy(pngp->decoded_scanline, inflate_buf, pngp->pitch); break;
break;
case 1: /* Sub */ case 3: /* Average */
for (i = 0; i < pngp->bpp; i++) for (i = 0; i < pngp->bpp; i++)
pngp->decoded_scanline[i] = inflate_buf[i]; {
for (i = pngp->bpp; i < pngp->pitch; i++) uint8_t avg = pngp->prev_scanline[i] >> 1;
pngp->decoded_scanline[i] = pngp->decoded_scanline[i - pngp->bpp] + inflate_buf[i]; pngp->decoded_scanline[i] = avg + inflate_buf[i];
break; }
for (i = pngp->bpp; i < pngp->pitch; i++)
{
uint8_t avg = (pngp->decoded_scanline[i - pngp->bpp] + pngp->prev_scanline[i]) >> 1;
pngp->decoded_scanline[i] = avg + inflate_buf[i];
}
break;
case 2: /* Up */ case 4: /* Paeth */
for (i = 0; i < pngp->pitch; i++) for (i = 0; i < pngp->bpp; i++)
pngp->decoded_scanline[i] = pngp->prev_scanline[i] + inflate_buf[i]; pngp->decoded_scanline[i] = paeth(0, pngp->prev_scanline[i], 0) + inflate_buf[i];
break; for (i = pngp->bpp; i < pngp->pitch; i++)
pngp->decoded_scanline[i] = paeth(pngp->decoded_scanline[i - pngp->bpp],
pngp->prev_scanline[i], pngp->prev_scanline[i - pngp->bpp]) + inflate_buf[i];
break;
case 3: /* Average */ default:
for (i = 0; i < pngp->bpp; i++) goto error;
{ }
uint8_t avg = pngp->prev_scanline[i] >> 1;
pngp->decoded_scanline[i] = avg + inflate_buf[i];
}
for (i = pngp->bpp; i < pngp->pitch; i++)
{
uint8_t avg = (pngp->decoded_scanline[i - pngp->bpp] + pngp->prev_scanline[i]) >> 1;
pngp->decoded_scanline[i] = avg + inflate_buf[i];
}
break;
case 4: /* Paeth */ switch (ihdr->color_type)
for (i = 0; i < pngp->bpp; i++) {
pngp->decoded_scanline[i] = paeth(0, pngp->prev_scanline[i], 0) + inflate_buf[i]; case 0:
for (i = pngp->bpp; i < pngp->pitch; i++) copy_line_bw(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
pngp->decoded_scanline[i] = paeth(pngp->decoded_scanline[i - pngp->bpp], break;
pngp->prev_scanline[i], pngp->prev_scanline[i - pngp->bpp]) + inflate_buf[i]; case 2:
break; copy_line_rgb(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
break;
case 3:
copy_line_plt(data, pngp->decoded_scanline, ihdr->width,
ihdr->depth, palette);
break;
case 4:
copy_line_gray_alpha(data, pngp->decoded_scanline, ihdr->width,
ihdr->depth);
break;
case 6:
copy_line_rgba(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
break;
}
default: memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch);
goto error;
}
switch (ihdr->color_type) pngp->h++;
{ inflate_buf += pngp->pitch;
case 0: data += ihdr->width;
copy_line_bw(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
break;
case 2:
copy_line_rgb(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
break;
case 3:
copy_line_plt(data, pngp->decoded_scanline, ihdr->width,
ihdr->depth, palette);
break;
case 4:
copy_line_gray_alpha(data, pngp->decoded_scanline, ihdr->width,
ihdr->depth);
break;
case 6:
copy_line_rgba(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
break;
}
memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch); goto begin;
pngp->h++;
inflate_buf += pngp->pitch;
data += ihdr->width;
}while(1);
return 0; return 0;
error: error:
@ -313,6 +309,7 @@ static bool png_reverse_filter_adam7(uint32_t *data,
deinterlace_pass(data, deinterlace_pass(data,
ihdr, tmp_data, pass_width, pass_height, &passes[pngp->pass]); ihdr, tmp_data, pass_width, pass_height, &passes[pngp->pass]);
free(tmp_data); free(tmp_data);
} }