mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
sdl, complete overhaul of hardware/software scaling
This commit is contained in:
kub
parent
6651998e9f
commit
d5d1778252
21 changed files with 1233 additions and 547 deletions
|
|
@ -7,7 +7,7 @@
|
|||
* nn: nearest neighbour
|
||||
* snn: "smoothed" nearest neighbour (see below)
|
||||
* bln: n-level-bilinear with n quantized weights
|
||||
* quantization: 0: a<1/2*n, 1/n: 1/2*n<=a<3/2*n, etc
|
||||
* quantization: 0: a<1/(2*n), 1/n: 1/(2*n)<=a<3/(2*n), etc
|
||||
* currently n=2, n=4 are implemented (there's n=8 mixing, but no filters)
|
||||
* [NB this has been brought to my attn, which is probably the same as bl2:
|
||||
* https://www.drdobbs.com/image-scaling-with-bresenham/184405045?pgno=1]
|
||||
|
|
@ -18,490 +18,586 @@
|
|||
* a sharper look than a bilinear filter, at the price of some visible jags
|
||||
* on diagonal edges.
|
||||
*
|
||||
* scaling modes:
|
||||
* 256x___ -> 320x___ only horizontal scaling. Produces an aspect error of
|
||||
* ~7% for NTSC 224 line modes, but is correct for PAL
|
||||
* 256/320x224/240
|
||||
* -> 320x240 always produces 320x240 at DAR 4:3
|
||||
* 160x144 -> 320x240 game gear (currently unused)
|
||||
* example scaling modes:
|
||||
* 256x_Y_ -> 320x_Y_, H32/mode 4, PAR 5:4, for PAL DAR 4:3 (NTSC 7% aspect err)
|
||||
* 256x224 -> 320x240, H32/mode 4, PAR 5:4, for NTSC DAR 4:3 (PAL 7% aspect err)
|
||||
* 320x224 -> 320x240, PAR 1:1, for NTSC, DAR 4:3 (PAL 7% etc etc...)
|
||||
* 160x144 -> 320x240: GG, PAR 6:5, scaling to 320x240 for DAR 4:3
|
||||
*
|
||||
* (C) 2021 kub <derkub@gmail.com>
|
||||
*/
|
||||
|
||||
#include "upscale.h"
|
||||
|
||||
/* 256x___ -> 320x___, H32/mode 4, PAR 5:4, for PAL DAR 4:3 (wrong for NTSC) */
|
||||
void upscale_clut_nn_256_320x___(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int height)
|
||||
/* X x Y -> X*5/4 x Y */
|
||||
void upscale_clut_nn_x_4_5(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_nop);
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_256_320x___(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int height, u16 *pal)
|
||||
void upscale_rgb_nn_x_4_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_256_320x___(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int height, u16 *pal)
|
||||
void upscale_rgb_snn_x_4_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_snn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
h_upscale_snn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_256_320x___(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int height, u16 *pal)
|
||||
void upscale_rgb_bl2_x_4_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, 256, f_pal);
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_256_320x___(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int height, u16 *pal)
|
||||
void upscale_rgb_bl4_x_4_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, 256, f_pal);
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
/* 256x224 -> 320x240, H32/mode 4, PAR 5:4, for NTSC DAR 4:3 (wrong for PAL) */
|
||||
void upscale_clut_nn_256_320x224_240(u8 *__restrict di, int ds, u8 *__restrict si, int ss)
|
||||
/* X x Y -> X*5/4 x Y*17/16 */
|
||||
void upscale_clut_nn_x_4_5_y_16_17(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
/* 14:15, 0 1 2 3 4 5 6 6 7 8 9 10 11 12 13 */
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
/* lines 0-6 */
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_nop);
|
||||
}
|
||||
/* lines 8-14 */
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_nop);
|
||||
}
|
||||
/* line 7 */
|
||||
di -= 8*ds;
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
di += 8*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
|
||||
di -= 8*ds;
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
di += 8*ds;
|
||||
di -= 9*ds;
|
||||
v_copy(&di[0], &di[-ds], swidth, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_nn_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
/* 14:15, 0 1 2 3 4 5 5+6 6+7 7+8 8 9 10 11 12 13 */
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_snn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_upscale_snn_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_nn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
|
||||
di -= 9*ds;
|
||||
v_copy(&di[0], &di[-ds], swidth, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_snn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_upscale_snn_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
|
||||
/* mix lines 6-8 */
|
||||
di -= 8*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_05, f_nop);
|
||||
v_mix(&di[-ds], &di[-2*ds], &di[-ds], 320, p_05, f_nop);
|
||||
v_mix(&di[ ds], &di[ ds], &di[ 2*ds], 320, p_05, f_nop);
|
||||
di += 8*ds;
|
||||
di -= 9*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_05, f_nop);
|
||||
v_mix(&di[-ds], &di[-2*ds], &di[-ds], swidth, p_05, f_nop);
|
||||
v_mix(&di[ ds], &di[ ds], &di[ 2*ds], swidth, p_05, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bln_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_bl2_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
/* 14:15, 0 1 2 2+3 3+4 4+5 5+6 6+7 7+8 8+9 9+10 10+11 11 12 13 */
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
/* lines 0-2 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_bln_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 4; j++) {
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
/* lines 3-11 mixing prep */
|
||||
di += ds;
|
||||
for (j = 0; j < 11; j++) {
|
||||
h_upscale_bln_4_5(di, ds, si, ss, 256, f_pal);
|
||||
di += ds;
|
||||
for (j = 0; j < 12; j++) {
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 12*ds;
|
||||
/* mixing line 3: line 2 = -ds, line 3 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_025, f_nop);
|
||||
/* mix lines 3-10 */
|
||||
di -= 13*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_05, f_nop);
|
||||
for (j = 0; j < 7; j++) {
|
||||
di += ds;
|
||||
/* mixing lines 4-5: line n-1 = 0, line n = +ds */
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_05, f_nop);
|
||||
}
|
||||
di += 6*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_025, f_nop);
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 14; j++) {
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 15*ds;
|
||||
/* mixing line 2: line 1 = -ds, line 2 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_025, f_nop);
|
||||
di += ds;
|
||||
/* mixing lines 3-5: line n-1 = 0, line n = +ds */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_025, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing line 6-8 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_05, f_nop);
|
||||
/* mixing lines 6-9 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_05, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 9-11 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_075, f_nop);
|
||||
/* mixing lines 10-13 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_075, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* lines 12-14, already in place */
|
||||
/* lines 14-16, already in place */
|
||||
di += 3*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
/* "classic" upscaler as found in several emulators. It's really more like a
|
||||
* x*4/3, y*16/15 upscaler, with an additional 5th row/17th line just inserted
|
||||
* from the source image. That gives nice n/4,n/16 alpha values plus better
|
||||
* symmetry in each block and avoids "borrowing" a row/line between blocks.
|
||||
*/
|
||||
void upscale_rgb_bln_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
/* 14:15, 0 1 2 2+3 3+4 4+5 5+6 6+7 7+8 8+9 9+10 10 11 12 13 */
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 4; j++) {
|
||||
h_upscale_bln_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 11; j++) {
|
||||
h_upscale_bl2_4_5(di, ds, si, ss, 256, f_pal);
|
||||
}
|
||||
/* mix lines 3-10 */
|
||||
di -= 12*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_05, f_nop);
|
||||
for (j = 0; j < 7; j++) {
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_05, f_nop);
|
||||
}
|
||||
di += 5*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
/* 14:15, 0 0+1 1+2 2+3 3+4 4+5 5+6 6+7 7+8 8+9 9+10 10+11 11+12 12 13 */
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
/* line 0 */
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, 256, f_pal);
|
||||
/* lines 1-14 mixing prep */
|
||||
di += ds;
|
||||
for (j = 0; j < 13; j++) {
|
||||
h_upscale_bl4_4_5(di, ds, si, ss, 256, f_pal);
|
||||
for (j = 0; j < 12; j++) {
|
||||
h_upscale_bln_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 14*ds;
|
||||
/* mixing line 1: line 0 = -ds, line 1 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_025, f_nop);
|
||||
di -= 13*ds;
|
||||
/* mixing line 4: line 3 = -ds, line 4 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_025, f_nop);
|
||||
di += ds;
|
||||
/* mixing lines 2-4: line n-1 = 0, line n = +ds */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_025, f_nop);
|
||||
/* mixing lines 5-6: line n-1 = 0, line n = +ds */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_025, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 5-8 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_05, f_nop);
|
||||
/* mixing line 7-9 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_05, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 9-12 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_075, f_nop);
|
||||
/* mixing lines 10-12 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_075, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* lines 13-14, already in place */
|
||||
di += 2*ds;
|
||||
/* lines 13-16, already in place */
|
||||
di += 4*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl8_256_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
/* experimental 8 level bilinear for quality assessment */
|
||||
void upscale_rgb_bl8_x_4_5_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j, d;
|
||||
int swidth = width * 5/4;
|
||||
int y, j;
|
||||
|
||||
/* 14:15, -1+0 0+1 1+2 2+3 3+4 4+5 5+6 6+7 7+8 8+9 9+10 10+11 11+12 12+13 13 */
|
||||
for (y = 0, d = ds; y < 224; y += 14, d = -ds) {
|
||||
/* lines 0-14 mixing prep */
|
||||
for (y = 0; y < 224; y += 16) {
|
||||
for (j = 0; j < 2; j++) {
|
||||
h_upscale_bl8_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 14; j++) {
|
||||
h_upscale_bl8_4_5(di, ds, si, ss, 256, f_pal);
|
||||
h_upscale_bl8_4_5(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 15*ds;
|
||||
/* mixing line 0: line 0 = -ds, line 1 = +ds */
|
||||
v_mix(&di[0], &di[d], &di[ds], 320, p_0125, f_nop);
|
||||
/* mixing line 2: line 2 = -ds, line 3 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_0125, f_nop);
|
||||
di += ds;
|
||||
/* mixing line 1: line 1 = 0, line 2 = +ds */
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_0125, f_nop);
|
||||
/* mixing line 3: line 3 = 0, line 4 = +ds */
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_0125, f_nop);
|
||||
di += ds;
|
||||
/* mixing lines 2-3: line n-1 = 0, line n = +ds */
|
||||
/* mixing lines 4-5: line n-1 = 0, line n = +ds */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_025, f_nop);
|
||||
v_mix(&di[0], &di[0], &di[ds], swidth, p_025, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 4-5 */
|
||||
/* mixing lines 6-7 */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_0375, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 6-7 */
|
||||
/* mixing lines 8-9 */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_05, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 8-9 */
|
||||
/* mixing lines 10-11 */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_0625, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 10-11 */
|
||||
/* mixing lines 12-13 */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_075, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 12-13 */
|
||||
/* mixing lines 14-15 */
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], 320, p_0875, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* line 14, already in place */
|
||||
/* line 16, already in place */
|
||||
di += ds;
|
||||
}
|
||||
}
|
||||
|
||||
/* 320x224 -> 320x240, PAR 1:1, for NTSC, DAR 4:3 (wrong for PAL) */
|
||||
void upscale_clut_nn_320x224_240(u8 *__restrict di, int ds, u8 *__restrict si, int ss)
|
||||
/* X x Y -> X x Y*17/16 */
|
||||
void upscale_clut_nn_y_16_17(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_nop);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_nop);
|
||||
}
|
||||
|
||||
di -= 8*ds;
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
di += 8*ds;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
}
|
||||
|
||||
di -= 8*ds;
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
di += 8*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 7; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
}
|
||||
|
||||
di -= 8*ds;
|
||||
v_mix(&di[ 0], &di[-ds], &di[ds], 320, p_05, f_nop);
|
||||
v_mix(&di[-ds], &di[-2*ds], &di[-ds], 320, p_05, f_nop);
|
||||
v_mix(&di[ ds], &di[ ds], &di[ 2*ds], 320, p_05, f_nop);
|
||||
di += 8*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
}
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
v_mix(&di[0], &si[-ss], &si[0], 320, p_05, f_pal);
|
||||
di += ds;
|
||||
si += ss;
|
||||
h_copy(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
si -= ss;
|
||||
for (j = 0; j < 4; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
di += ds;
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
|
||||
di -= 9*ds;
|
||||
v_copy(&di[0], &di[-ds], width, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_320x224_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_nn_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 224; y += 14) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &si[-ss], &si[0], 320, p_025, f_pal);
|
||||
di += ds;
|
||||
si += ss;
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &si[-ss], &si[0], 320, p_05, f_pal);
|
||||
di += ds;
|
||||
si += ss;
|
||||
di += ds;
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &si[-ss], &si[0], 320, p_075, f_pal);
|
||||
di += ds;
|
||||
si += ss;
|
||||
|
||||
di -= 9*ds;
|
||||
v_copy(&di[0], &di[-ds], width, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
si -= ss;
|
||||
di += ds;
|
||||
for (j = 0; j < 8; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
|
||||
/* mix lines 6-8 */
|
||||
di -= 9*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], width, p_05, f_nop);
|
||||
v_mix(&di[-ds], &di[-2*ds], &di[-ds], width, p_05, f_nop);
|
||||
v_mix(&di[ ds], &di[ ds], &di[ 2*ds], width, p_05, f_nop);
|
||||
di += 9*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 4; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 12; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
/* mix lines 3-10 */
|
||||
di -= 13*ds;
|
||||
v_mix(&di[0], &di[-ds], &di[ds], width, p_05, f_nop);
|
||||
for (j = 0; j < 7; j++) {
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[0], &di[ds], width, p_05, f_nop);
|
||||
}
|
||||
di += 6*ds;
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_y_16_17(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 16) {
|
||||
for (j = 0; j < 2; j++) {
|
||||
h_copy(di, ds, si, ss, 320, f_pal);
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di += ds;
|
||||
for (j = 0; j < 14; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 15*ds;
|
||||
/* mixing line 2: line 1 = -ds, line 2 = +ds */
|
||||
v_mix(&di[0], &di[-ds], &di[ds], width, p_025, f_nop);
|
||||
di += ds;
|
||||
/* mixing lines 3-5: line n-1 = 0, line n = +ds */
|
||||
for (j = 0; j < 3; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], width, p_025, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 6-9 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], width, p_05, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* mixing lines 10-13 */
|
||||
for (j = 0; j < 4; j++) {
|
||||
v_mix(&di[0], &di[0], &di[ds], width, p_075, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* lines 14-16, already in place */
|
||||
di += 3*ds;
|
||||
}
|
||||
}
|
||||
|
||||
/* 160x144 -> 320x240: GG, PAR 6:5, scaling to 320x240 for DAR 4:3 */
|
||||
/* NB for smoother image could scale to 288x216, x*9/5, y*3/2 ?
|
||||
* h: 11111 11112 22222 22233 33333 33444 44444 45555 55555
|
||||
* 1 1 2 2+3 3 3+4 4 5 5
|
||||
* v: 11 12 22
|
||||
* 1 1+2 2
|
||||
*/
|
||||
void upscale_clut_nn_160_320x144_240(u8 *__restrict di, int ds, u8 *__restrict si, int ss)
|
||||
/* X x Y -> X*2/1 x Y, e.g. for X 160->320 (GG) */
|
||||
void upscale_clut_nn_x_1_2(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_nn_1_2(di, ds, si, ss, width, f_nop);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_x_1_2(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_nn_1_2(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_x_1_2(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y;
|
||||
|
||||
for (y = 0; y < height; y++) {
|
||||
h_upscale_bl2_1_2(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
}
|
||||
|
||||
/* X x Y -> X*2/1 x Y*5/3 (GG) */
|
||||
void upscale_clut_nn_x_1_2_y_3_5(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int swidth = width * 2;
|
||||
int y, j;
|
||||
|
||||
/* 3:5, 0 0 1 1 2 */
|
||||
for (y = 0; y < 144; y += 3) {
|
||||
for (y = 0; y < height; y += 3) {
|
||||
/* lines 0,2,4 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_nn_1_2(di, ds, si, ss, 160, f_nop);
|
||||
h_upscale_nn_1_2(di, ds, si, ss, width, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* lines 1,3 */
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
v_copy(&di[0], &di[-ds], swidth, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_160_320x144_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_nn_x_1_2_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 2;
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < 144; y += 3) {
|
||||
for (y = 0; y < height; y += 3) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_nn_1_2(di, ds, si, ss, 160, f_pal);
|
||||
h_upscale_nn_1_2(di, ds, si, ss, width, f_pal);
|
||||
di += ds;
|
||||
}
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_copy(&di[0], &di[-ds], 320, f_nop);
|
||||
v_copy(&di[0], &di[-ds], swidth, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_snn_160_320x144_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_bl2_x_1_2_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 2;
|
||||
int y, j;
|
||||
|
||||
/* 3:5, 0 0+1 1 1+2 2 */
|
||||
for (y = 0; y < 144; y += 3) {
|
||||
for (y = 0; y < height; y += 3) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_nn_1_2(di, ds, si, ss, 160, f_pal);
|
||||
h_upscale_bl2_1_2(di, ds, si, ss, width, f_pal);
|
||||
di += ds;
|
||||
}
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_05, f_nop);
|
||||
v_mix(&di[0], &di[-ds], &di[ds], swidth, p_05, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl2_160_320x144_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_bl4_x_1_2_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int swidth = width * 2;
|
||||
int y, j, d;
|
||||
|
||||
/* for 1st block backwards reference virtually duplicate source line 0 */
|
||||
for (y = 0, d = 2*ds; y < height; y += 3, d = -ds) {
|
||||
di += 2*ds;
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_bl2_1_2(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 5*ds;
|
||||
v_mix(&di[0], &di[d ], &di[2*ds], swidth, p_05, f_nop); /*-1+0 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ds], &di[2*ds], swidth, p_075, f_nop);/* 0+1 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], swidth, p_025, f_nop);/* 0+1 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], swidth, p_05, f_nop); /* 1+2 */
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
|
||||
/* X x Y -> X x Y*5/3, e.g. for Y 144->240 (GG) */
|
||||
void upscale_clut_nn_y_3_5(u8 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
/* 3:5, 0 0+1 1 1+2 2 */
|
||||
for (y = 0; y < 144; y += 3) {
|
||||
for (y = 0; y < height; y += 3) {
|
||||
/* lines 0,2,4 */
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_bl2_1_2(di, ds, si, ss, 160, f_pal);
|
||||
h_copy(di, ds, si, ss, width, f_nop);
|
||||
di += ds;
|
||||
}
|
||||
/* lines 1,3 */
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_copy(&di[0], &di[-ds], width, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_nn_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 3) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
di += ds;
|
||||
}
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[-ds], &di[ds], 320, p_05, f_nop);
|
||||
v_copy(&di[0], &di[-ds], width, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_160_320x144_240(u16 *__restrict di, int ds, u8 *__restrict si, int ss, u16 *pal)
|
||||
void upscale_rgb_bl2_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j;
|
||||
|
||||
for (y = 0; y < height; y += 3) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
di += ds;
|
||||
}
|
||||
di -= 5*ds;
|
||||
for (j = 0; j < 2; j++) {
|
||||
v_mix(&di[0], &di[-ds], &di[ds], width, p_05, f_nop);
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void upscale_rgb_bl4_y_3_5(u16 *__restrict di, int ds, u8 *__restrict si, int ss, int width, int height, u16 *pal)
|
||||
{
|
||||
int y, j, d;
|
||||
|
||||
/* 3:5, -1+0, 0+1 0+1 1+2 2
|
||||
* for 1st block backwards reference virtually duplicate source line 0 */
|
||||
for (y = 0, d = 2*ds; y < 144; y += 3, d = -ds) {
|
||||
/* for 1st block backwards reference virtually duplicate source line 0 */
|
||||
for (y = 0, d = 2*ds; y < height; y += 3, d = -ds) {
|
||||
di += 2*ds;
|
||||
for (j = 0; j < 3; j++) {
|
||||
h_upscale_bl2_1_2(di, ds, si, ss, 160, f_pal);
|
||||
h_copy(di, ds, si, ss, width, f_pal);
|
||||
}
|
||||
di -= 5*ds;
|
||||
v_mix(&di[0], &di[d ], &di[2*ds], 320, p_05, f_nop); /*-1+0 */
|
||||
v_mix(&di[0], &di[d ], &di[2*ds], width, p_05, f_nop); /*-1+0 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ds], &di[2*ds], 320, p_075, f_nop); /* 0+1 */
|
||||
v_mix(&di[0], &di[ds], &di[2*ds], width, p_075, f_nop);/* 0+1 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], 320, p_025, f_nop); /* 0+1 */
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], width, p_025, f_nop);/* 0+1 */
|
||||
di += ds;
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], 320, p_05, f_nop); /* 1+2 */
|
||||
v_mix(&di[0], &di[ 0], &di[ ds], width, p_05, f_nop); /* 1+2 */
|
||||
di += 2*ds;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue