mirror
/
RGBtoHDMI
kopia lustrzana https://github.com/hoglet67/RGBtoHDMI
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix screencap fractional scaling

pull/115/head
IanSB 2019-12-08 02:45:40 +00:00
rodzic a1e8929954
commit 1012ce2d6a
2 zmienionych plików z 80 dodań i 29 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

95
src/filesystem.c
Wyświetl plik

@ -36,13 +36,9 @@ static int generate_png(capture_info_t *capinfo, uint8_t **png, unsigned int *pn
state.info_png.color.colortype = LCT_PALETTE;
state.info_png.color.bitdepth = 8;
int width = capinfo->width;
int height = capinfo->height;
for (int i = 0; i < (1 << capinfo->bpp); i++) {
int triplet = osd_get_palette(i);
int r = triplet & 0xff;
@ -52,42 +48,95 @@ static int generate_png(capture_info_t *capinfo, uint8_t **png, unsigned int *pn
lodepng_palette_add(&state.info_raw, r, g, b, 255);
}
int hscale = get_hscale();
int vscale = get_vscale();
log_info("Scaling is %d x %d", hscale, vscale);
uint8_t png_buffer[width * hscale * height * vscale];
log_info("Scaling is %d/2 x %d/2", hscale, vscale);
uint8_t png_buffer[((width * hscale) >> 1) * ((height * vscale) >> 1)];
uint8_t *pp = png_buffer;
if (capinfo->bpp == 8) {
for (int y = 0; y < capinfo->height; y++) {
for (int sy = 0; sy < vscale; sy++) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int sy = 0; sy < (vscale >> 1); sy++) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int x = 0; x < capinfo->width; x++) {
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < hscale; sx++) {
*pp++ = single_pixel;
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel;
}
if ((hscale & 1) == 1 && (x & 1) == 1) {
*pp++ = single_pixel;
}
}
}
if ((vscale & 1) == 1 && (y & 1) == 1) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int x = 0; x < capinfo->width; x++) {
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel;
}
if ((hscale & 1) == 1 && (x & 1) == 1) {
*pp++ = single_pixel;
}
}
}
}
} else {
for (int y = 0; y < capinfo->height; y++) {
for (int sy = 0; sy < vscale; sy++) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int sy = 0; sy < (vscale >> 1); sy++) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int x = 0; x < (capinfo->width >> 1); x++) {
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < hscale; sx++) {
*pp++ = single_pixel & 0xf;
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel >> 4;
}
for (int sx = 0; sx < hscale; sx++) {
*pp++ = single_pixel >> 4;
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel & 0x0f;
}
if ((hscale & 1) == 1 && (x & 1) == 1) {
*pp++ = single_pixel & 0x0f;
}
}
}
if ((vscale & 1) == 1 && (y & 1) == 1) {
uint8_t *fp = capinfo->fb + capinfo->pitch * y;
for (int x = 0; x < (capinfo->width >> 1); x++) {
uint8_t single_pixel = *fp++;
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel & 0xf;
}
for (int sx = 0; sx < (hscale >> 1); sx++) {
*pp++ = single_pixel >> 4;
}
if ((hscale & 1) == 1 && (x & 1) == 1) {
*pp++ = single_pixel >> 4;
}
}
}
}
}
unsigned int result = lodepng_encode(png, png_len, png_buffer, width * hscale, height * vscale, &state);
unsigned int result = lodepng_encode(png, png_len, png_buffer, (width * hscale) >> 1, (height * vscale) >> 1, &state);
if (result) {
log_warn("lodepng_encode32 failed (result = %d)", result);
return 1;
@ -482,7 +531,7 @@ void scan_sub_profiles(char sub_profile_names[MAX_SUB_PROFILES][MAX_PROFILE_WIDT
FRESULT res;
DIR dir;
static FILINFO fno;
char path[100] = "/Profiles/";
char path[100] = "/Profiles/";
strncat(path, cpld->name, 80);
strncat(path, "/", 80);
strncat(path, sub_path, 80);
@ -587,12 +636,12 @@ int file_save(char *dirpath, char *name, char *buffer, unsigned int buffer_size)
log_warn("Failed to create dir %s (result = %d)",SAVED_PROFILE_BASE, result);
}
sprintf(path, "%s/%s", SAVED_PROFILE_BASE, cpld->name);
result = f_mkdir(path);
if (result != FR_OK && result != FR_EXIST) {
log_warn("Failed to create dir %s (result = %d)",path, result);
}
if (dirpath != NULL) {
sprintf(path, "%s/%s/%s", SAVED_PROFILE_BASE, cpld->name, dirpath);
result = f_mkdir(path);

14
src/geometry.c
Wyświetl plik

@ -425,15 +425,17 @@ void geometry_get_fb_params(capture_info_t *capinfo) {
//log_info("scaling h = %d, %d, %f, %d, %d, %d, %d",h_size, h_size43, hscalef, hscale, hborder, hborder43, newhborder43);
//log_info("scaling v = %d, %d, %f, %d, %d, %d, %d",v_size, v_size43, vscalef, vscale, vborder, vborder43, newvborder43);
caphscale = 1;
capvscale = 1;
caphscale = 2;
capvscale = 2;
switch (scaling) {
case SCALING_INTEGER:
capinfo->width = adjusted_width + hborder;
capinfo->height = adjusted_height + vborder;
caphscale = hscale >> double_width;
capvscale = vscale >> double_height;
if (!mode7) { //don't scale mode 7
caphscale = (h_size << 1) / capinfo->width;
capvscale = (v_size << 1) / capinfo->height;
}
break;
case SCALING_MANUAL43:
capinfo->width = (geometry_max_h_width << double_width ) + (int)((double)((h_size - h_size43) << double_width) / hscalef);
@ -459,14 +461,14 @@ void geometry_get_fb_params(capture_info_t *capinfo) {
int get_hscale() {
if (capscale == 0) {
return 1;
return 2;
} else {
return caphscale;
}
}
int get_vscale() {
if (capscale == 0) {
return 1;
return 2;
} else {
return capvscale;
}