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

server: Extract pixel format functions into pixels.c

tight-png
Andri Yngvason 2019-12-30 20:13:40 +00:00
parent a0376f2fd4
commit ee3f2fefff
3 changed files with 168 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pixels.h
View File

@ -17,9 +17,15 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <unistd.h>
struct rfb_pixel_format;
void pixel32_to_cpixel(uint8_t* restrict dst, void pixel32_to_cpixel(uint8_t* restrict dst,
const struct rfb_pixel_format* dst_fmt, const struct rfb_pixel_format* dst_fmt,
const uint32_t* restrict src, const uint32_t* restrict src,
const struct rfb_pixel_format* src_fmt, const struct rfb_pixel_format* src_fmt,
size_t bytes_per_cpixel, size_t len); size_t bytes_per_cpixel, size_t len);
int rfb_pixfmt_from_fourcc(struct rfb_pixel_format *dst, uint32_t src);
uint32_t rfb_pixfmt_to_fourcc(const struct rfb_pixel_format* fmt);

161
src/pixels.c
View File

@ -17,6 +17,7 @@
#include "rfb-proto.h" #include "rfb-proto.h"
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <libdrm/drm_fourcc.h>
#define POPCOUNT(x) __builtin_popcount(x) #define POPCOUNT(x) __builtin_popcount(x)
@ -127,3 +128,163 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
#undef CONVERT_PIXELS #undef CONVERT_PIXELS
} }
/* clang-format off */
int rfb_pixfmt_from_fourcc(struct rfb_pixel_format *dst, uint32_t src) {
switch (src & ~DRM_FORMAT_BIG_ENDIAN) {
case DRM_FORMAT_RGBA8888:
case DRM_FORMAT_RGBX8888:
dst->red_shift = 24;
dst->green_shift = 16;
dst->blue_shift = 8;
goto bpp_32;
case DRM_FORMAT_BGRA8888:
case DRM_FORMAT_BGRX8888:
dst->red_shift = 8;
dst->green_shift = 16;
dst->blue_shift = 24;
goto bpp_32;
case DRM_FORMAT_ARGB8888:
case DRM_FORMAT_XRGB8888:
dst->red_shift = 0;
dst->green_shift = 8;
dst->blue_shift = 16;
goto bpp_32;
case DRM_FORMAT_ABGR8888:
case DRM_FORMAT_XBGR8888:
dst->red_shift = 16;
dst->green_shift = 8;
dst->blue_shift = 0;
bpp_32:
dst->bits_per_pixel = 32;
dst->depth = 24;
dst->red_max = 0xff;
dst->green_max = 0xff;
dst->blue_max = 0xff;
break;
case DRM_FORMAT_RGBA4444:
case DRM_FORMAT_RGBX4444:
dst->red_shift = 12;
dst->green_shift = 8;
dst->blue_shift = 4;
goto bpp_16;
case DRM_FORMAT_BGRA4444:
case DRM_FORMAT_BGRX4444:
dst->red_shift = 4;
dst->green_shift = 8;
dst->blue_shift = 12;
goto bpp_16;
case DRM_FORMAT_ARGB4444:
case DRM_FORMAT_XRGB4444:
dst->red_shift = 8;
dst->green_shift = 4;
dst->blue_shift = 0;
goto bpp_16;
case DRM_FORMAT_ABGR4444:
case DRM_FORMAT_XBGR4444:
dst->red_shift = 0;
dst->green_shift = 4;
dst->blue_shift = 8;
bpp_16:
dst->bits_per_pixel = 16;
dst->depth = 12;
dst->red_max = 0x7f;
dst->green_max = 0x7f;
dst->blue_max = 0x7f;
break;
default:
return -1;
}
dst->big_endian_flag = !!(src & DRM_FORMAT_BIG_ENDIAN);
dst->true_colour_flag = 1;
return 0;
};
static int max_values_to_depth(int r, int g, int b)
{
if (r == 5 && g == 5 && b == 3) return 8;
if (r == 15 && g == 15 && b == 15) return 12;
if (r == 31 && g == 31 && b == 31) return 15;
if (r == 31 && g == 127 && b == 31) return 16;
if (r == 255 && g == 255 && b == 255) return 24;
if (r == 1023 && g == 1023 && b == 1023) return 30;
return -1;
}
static uint32_t shift_values_to_fourcc(int r, int g, int b, int bpp)
{
#define RGBEQ(rv, gv, bv) (r == (rv) && g == (gv) && b == (bv))
if (bpp == 32 && RGBEQ(24, 16, 8)) return DRM_FORMAT_RGBX8888;
if (bpp == 32 && RGBEQ( 8, 16, 24)) return DRM_FORMAT_BGRX8888;
if (bpp == 32 && RGBEQ(16, 8, 0)) return DRM_FORMAT_XRGB8888;
if (bpp == 32 && RGBEQ( 0, 8, 16)) return DRM_FORMAT_XBGR8888;
if (bpp == 32 && RGBEQ(22, 12, 2)) return DRM_FORMAT_RGBX1010102;
if (bpp == 32 && RGBEQ( 2, 12, 22)) return DRM_FORMAT_BGRX1010102;
if (bpp == 32 && RGBEQ(20, 10, 0)) return DRM_FORMAT_XRGB2101010;
if (bpp == 32 && RGBEQ( 0, 10, 20)) return DRM_FORMAT_XBGR2101010;
if (bpp == 24 && RGBEQ( 0, 8, 16)) return DRM_FORMAT_BGR888;
if (bpp == 24 && RGBEQ(16, 8, 0)) return DRM_FORMAT_RGB888;
if (bpp == 16 && RGBEQ(12, 8, 4)) return DRM_FORMAT_RGBX4444;
if (bpp == 16 && RGBEQ( 4, 8, 12)) return DRM_FORMAT_BGRX4444;
if (bpp == 16 && RGBEQ( 8, 4, 0)) return DRM_FORMAT_XRGB4444;
if (bpp == 16 && RGBEQ( 0, 4, 8)) return DRM_FORMAT_XBGR4444;
if (bpp == 16 && RGBEQ(11, 6, 1)) return DRM_FORMAT_RGBX5551;
if (bpp == 16 && RGBEQ( 1, 6, 11)) return DRM_FORMAT_BGRX5551;
if (bpp == 16 && RGBEQ(15, 5, 0)) return DRM_FORMAT_XRGB1555;
if (bpp == 16 && RGBEQ( 0, 5, 15)) return DRM_FORMAT_XBGR1555;
if (bpp == 16 && RGBEQ(11, 5, 0)) return DRM_FORMAT_RGB565;
if (bpp == 16 && RGBEQ( 0, 5, 11)) return DRM_FORMAT_BGR565;
if (bpp == 8 && RGBEQ( 5, 2, 0)) return DRM_FORMAT_RGB332;
if (bpp == 8 && RGBEQ( 0, 2, 5)) return DRM_FORMAT_BGR233;
return DRM_FORMAT_INVALID;
#undef RGBEQ
}
/* clang-format on */
int get_fourcc_depth(uint32_t fourcc)
{
switch (fourcc) {
case DRM_FORMAT_RGB332:
case DRM_FORMAT_BGR233:
return 8;
default:
return (((fourcc >> 24) & 0xff) - '0') +
(((fourcc >> 16) & 0xff) - '0') * 10;
}
}
uint32_t rfb_pixfmt_to_fourcc(const struct rfb_pixel_format* fmt)
{
if (!fmt->true_colour_flag)
return DRM_FORMAT_INVALID;
/* Note: The depth value given by the client is ignored */
int depth =
max_values_to_depth(fmt->red_max, fmt->green_max, fmt->blue_max);
if (depth < 0)
return DRM_FORMAT_INVALID;
uint32_t fourcc =
shift_values_to_fourcc(fmt->red_shift, fmt->green_shift,
fmt->blue_shift, fmt->bits_per_pixel);
if (fourcc == DRM_FORMAT_INVALID)
return DRM_FORMAT_INVALID;
if (get_fourcc_depth(fourcc) != depth)
return DRM_FORMAT_INVALID;
fourcc |= fmt->big_endian_flag ? DRM_FORMAT_BIG_ENDIAN : 0;
return fourcc;
}

160
src/server.c
View File

@ -24,6 +24,7 @@
#include "fb.h" #include "fb.h"
#include "neatvnc.h" #include "neatvnc.h"
#include "common.h" #include "common.h"
#include "pixels.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -221,165 +222,6 @@ static void disconnect_all_other_clients(struct nvnc_client* client)
client_unref(client); client_unref(client);
} }
/* clang-format off */
int rfb_pixfmt_from_fourcc(struct rfb_pixel_format *dst, uint32_t src) {
switch (src & ~DRM_FORMAT_BIG_ENDIAN) {
case DRM_FORMAT_RGBA8888:
case DRM_FORMAT_RGBX8888:
dst->red_shift = 24;
dst->green_shift = 16;
dst->blue_shift = 8;
goto bpp_32;
case DRM_FORMAT_BGRA8888:
case DRM_FORMAT_BGRX8888:
dst->red_shift = 8;
dst->green_shift = 16;
dst->blue_shift = 24;
goto bpp_32;
case DRM_FORMAT_ARGB8888:
case DRM_FORMAT_XRGB8888:
dst->red_shift = 0;
dst->green_shift = 8;
dst->blue_shift = 16;
goto bpp_32;
case DRM_FORMAT_ABGR8888:
case DRM_FORMAT_XBGR8888:
dst->red_shift = 16;
dst->green_shift = 8;
dst->blue_shift = 0;
bpp_32:
dst->bits_per_pixel = 32;
dst->depth = 24;
dst->red_max = 0xff;
dst->green_max = 0xff;
dst->blue_max = 0xff;
break;
case DRM_FORMAT_RGBA4444:
case DRM_FORMAT_RGBX4444:
dst->red_shift = 12;
dst->green_shift = 8;
dst->blue_shift = 4;
goto bpp_16;
case DRM_FORMAT_BGRA4444:
case DRM_FORMAT_BGRX4444:
dst->red_shift = 4;
dst->green_shift = 8;
dst->blue_shift = 12;
goto bpp_16;
case DRM_FORMAT_ARGB4444:
case DRM_FORMAT_XRGB4444:
dst->red_shift = 8;
dst->green_shift = 4;
dst->blue_shift = 0;
goto bpp_16;
case DRM_FORMAT_ABGR4444:
case DRM_FORMAT_XBGR4444:
dst->red_shift = 0;
dst->green_shift = 4;
dst->blue_shift = 8;
bpp_16:
dst->bits_per_pixel = 16;
dst->depth = 12;
dst->red_max = 0x7f;
dst->green_max = 0x7f;
dst->blue_max = 0x7f;
break;
default:
return -1;
}
dst->big_endian_flag = !!(src & DRM_FORMAT_BIG_ENDIAN);
dst->true_colour_flag = 1;
return 0;
};
static int max_values_to_depth(int r, int g, int b)
{
if (r == 5 && g == 5 && b == 3) return 8;
if (r == 15 && g == 15 && b == 15) return 12;
if (r == 31 && g == 31 && b == 31) return 15;
if (r == 31 && g == 127 && b == 31) return 16;
if (r == 255 && g == 255 && b == 255) return 24;
if (r == 1023 && g == 1023 && b == 1023) return 30;
return -1;
}
static uint32_t shift_values_to_fourcc(int r, int g, int b, int bpp)
{
#define RGBEQ(rv, gv, bv) (r == (rv) && g == (gv) && b == (bv))
if (bpp == 32 && RGBEQ(24, 16, 8)) return DRM_FORMAT_RGBX8888;
if (bpp == 32 && RGBEQ( 8, 16, 24)) return DRM_FORMAT_BGRX8888;
if (bpp == 32 && RGBEQ(16, 8, 0)) return DRM_FORMAT_XRGB8888;
if (bpp == 32 && RGBEQ( 0, 8, 16)) return DRM_FORMAT_XBGR8888;
if (bpp == 32 && RGBEQ(22, 12, 2)) return DRM_FORMAT_RGBX1010102;
if (bpp == 32 && RGBEQ( 2, 12, 22)) return DRM_FORMAT_BGRX1010102;
if (bpp == 32 && RGBEQ(20, 10, 0)) return DRM_FORMAT_XRGB2101010;
if (bpp == 32 && RGBEQ( 0, 10, 20)) return DRM_FORMAT_XBGR2101010;
if (bpp == 24 && RGBEQ( 0, 8, 16)) return DRM_FORMAT_BGR888;
if (bpp == 24 && RGBEQ(16, 8, 0)) return DRM_FORMAT_RGB888;
if (bpp == 16 && RGBEQ(12, 8, 4)) return DRM_FORMAT_RGBX4444;
if (bpp == 16 && RGBEQ( 4, 8, 12)) return DRM_FORMAT_BGRX4444;
if (bpp == 16 && RGBEQ( 8, 4, 0)) return DRM_FORMAT_XRGB4444;
if (bpp == 16 && RGBEQ( 0, 4, 8)) return DRM_FORMAT_XBGR4444;
if (bpp == 16 && RGBEQ(11, 6, 1)) return DRM_FORMAT_RGBX5551;
if (bpp == 16 && RGBEQ( 1, 6, 11)) return DRM_FORMAT_BGRX5551;
if (bpp == 16 && RGBEQ(15, 5, 0)) return DRM_FORMAT_XRGB1555;
if (bpp == 16 && RGBEQ( 0, 5, 15)) return DRM_FORMAT_XBGR1555;
if (bpp == 16 && RGBEQ(11, 5, 0)) return DRM_FORMAT_RGB565;
if (bpp == 16 && RGBEQ( 0, 5, 11)) return DRM_FORMAT_BGR565;
if (bpp == 8 && RGBEQ( 5, 2, 0)) return DRM_FORMAT_RGB332;
if (bpp == 8 && RGBEQ( 0, 2, 5)) return DRM_FORMAT_BGR233;
return DRM_FORMAT_INVALID;
#undef RGBEQ
}
/* clang-format on */
int get_fourcc_depth(uint32_t fourcc)
{
switch (fourcc) {
case DRM_FORMAT_RGB332:
case DRM_FORMAT_BGR233:
return 8;
default:
return (((fourcc >> 24) & 0xff) - '0') +
(((fourcc >> 16) & 0xff) - '0') * 10;
}
}
uint32_t rfb_pixfmt_to_fourcc(const struct rfb_pixel_format* fmt)
{
if (!fmt->true_colour_flag)
return DRM_FORMAT_INVALID;
/* Note: The depth value given by the client is ignored */
int depth =
max_values_to_depth(fmt->red_max, fmt->green_max, fmt->blue_max);
if (depth < 0)
return DRM_FORMAT_INVALID;
uint32_t fourcc =
shift_values_to_fourcc(fmt->red_shift, fmt->green_shift,
fmt->blue_shift, fmt->bits_per_pixel);
if (fourcc == DRM_FORMAT_INVALID)
return DRM_FORMAT_INVALID;
if (get_fourcc_depth(fourcc) != depth)
return DRM_FORMAT_INVALID;
fourcc |= fmt->big_endian_flag ? DRM_FORMAT_BIG_ENDIAN : 0;
return fourcc;
}
static void send_server_init_message(struct nvnc_client* client) static void send_server_init_message(struct nvnc_client* client)
{ {
struct nvnc* server = client->server; struct nvnc* server = client->server;