RPJosh
/
neatvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raw-encoding: Do proper pixel conversion

tight-png
Andri Yngvason 2019-10-14 10:33:43 +00:00
parent a43bb5d3d4
commit de1f63573b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pixels.c
View File

@ -32,7 +32,7 @@ void pixel32_to_cpixel(uint8_t *restrict dst,
assert(dst_fmt->true_colour_flag); assert(dst_fmt->true_colour_flag);
assert(dst_fmt->bits_per_pixel <= 32); assert(dst_fmt->bits_per_pixel <= 32);
assert(dst_fmt->depth <= 24); assert(dst_fmt->depth <= 24);
assert(bytes_per_cpixel <= 3 && bytes_per_cpixel >= 1); assert(bytes_per_cpixel <= 4 && bytes_per_cpixel >= 1);
uint32_t src_red_shift = src_fmt->red_shift; uint32_t src_red_shift = src_fmt->red_shift;
uint32_t src_green_shift = src_fmt->green_shift; uint32_t src_green_shift = src_fmt->green_shift;
@ -86,6 +86,8 @@ void pixel32_to_cpixel(uint8_t *restrict dst,
dst_blue_shift -= min_dst_shift; dst_blue_shift -= min_dst_shift;
} }
/* fallthrough */
case 4:
dst_endian_correction = dst_fmt->big_endian_flag ? 16 : 0; dst_endian_correction = dst_fmt->big_endian_flag ? 16 : 0;
while (len--) { while (len--) {

7
src/raw-encoding.c
View File

@ -2,6 +2,7 @@
#include "rfb-proto.h" #include "rfb-proto.h"
#include "vec.h" #include "vec.h"
#include "fb.h" #include "fb.h"
#include "pixels.h"
#include <pixman.h> #include <pixman.h>
@ -26,9 +27,11 @@ int raw_encode_box(struct vec *dst, const struct rfb_pixel_format *dst_fmt,
uint32_t* b = fb->addr; uint32_t* b = fb->addr;
int bytes_per_pixel = dst_fmt->depth / 8;
for (int y = y_start; y < y_start + height; ++y) for (int y = y_start; y < y_start + height; ++y)
for (int x = x_start; x < x_start + width; ++x) pixel32_to_cpixel(dst->data, dst_fmt, b + y * stride, src_fmt,
vec_fast_append_32(dst, b[x + y * stride]); bytes_per_pixel, width);
return 0; return 0;
} }