pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-06 03:32:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Encapsulate lz information in ImageEncoders structure

Browse Source 
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-06-09 11:53:16 +01:00
parent fa0a579a65
commit a25182f060
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/dcc-encoders.c
View File

@ -308,19 +308,19 @@ static void image_encoders_init_quic(ImageEncoders *enc)
}
}
static void dcc_init_lz(DisplayChannelClient *dcc)
static void image_encoders_init_lz(ImageEncoders *enc)
{
dcc->lz_data.usr.error = lz_usr_error;
dcc->lz_data.usr.warn = lz_usr_warn;
dcc->lz_data.usr.info = lz_usr_warn;
dcc->lz_data.usr.malloc = lz_usr_malloc;
dcc->lz_data.usr.free = lz_usr_free;
dcc->lz_data.usr.more_space = lz_usr_more_space;
dcc->lz_data.usr.more_lines = lz_usr_more_lines;
enc->lz_data.usr.error = lz_usr_error;
enc->lz_data.usr.warn = lz_usr_warn;
enc->lz_data.usr.info = lz_usr_warn;
enc->lz_data.usr.malloc = lz_usr_malloc;
enc->lz_data.usr.free = lz_usr_free;
enc->lz_data.usr.more_space = lz_usr_more_space;
enc->lz_data.usr.more_lines = lz_usr_more_lines;
dcc->lz = lz_create(&dcc->lz_data.usr);
enc->lz = lz_create(&enc->lz_data.usr);
if (!dcc->lz) {
if (!enc->lz) {
spice_critical("create lz failed");
}
}
@ -404,7 +404,7 @@ void dcc_encoders_init(DisplayChannelClient *dcc)
dcc_init_glz_data(dcc);
image_encoders_init_quic(enc);
dcc_init_lz(dcc);
image_encoders_init_lz(enc);
dcc_init_jpeg(dcc);
#ifdef USE_LZ4
dcc_init_lz4(dcc);
@ -420,8 +420,8 @@ void dcc_encoders_free(DisplayChannelClient *dcc)
ImageEncoders *enc = &dcc->encoders;
quic_destroy(enc->quic);
enc->quic = NULL;
lz_destroy(dcc->lz);
dcc->lz = NULL;
lz_destroy(enc->lz);
enc->lz = NULL;
jpeg_encoder_destroy(dcc->jpeg);
dcc->jpeg = NULL;
#ifdef USE_LZ4

3
server/dcc-encoders.h
View File

@ -164,6 +164,9 @@ struct RedGlzDrawable {
struct ImageEncoders {
QuicData quic_data;
QuicContext *quic;
LzData lz_data;
LzContext *lz;
};
typedef struct compress_send_data_t {

8
server/dcc.c
View File

@ -788,8 +788,8 @@ static int dcc_compress_image_lz(DisplayChannelClient *dcc,
SpiceImage *dest, SpiceBitmap *src,
compress_send_data_t* o_comp_data)
{
LzData *lz_data = &dcc->lz_data;
LzContext *lz = dcc->lz;
LzData *lz_data = &dcc->encoders.lz_data;
LzContext *lz = dcc->encoders.lz;
LzImageType type = bitmap_fmt_to_lz_image_type[src->format];
int size; // size of the compressed data
@ -854,9 +854,9 @@ static int dcc_compress_image_jpeg(DisplayChannelClient *dcc, SpiceImage *dest,
SpiceBitmap *src, compress_send_data_t* o_comp_data)
{
JpegData *jpeg_data = &dcc->jpeg_data;
LzData *lz_data = &dcc->lz_data;
LzData *lz_data = &dcc->encoders.lz_data;
JpegEncoderContext *jpeg = dcc->jpeg;
LzContext *lz = dcc->lz;
LzContext *lz = dcc->encoders.lz;
volatile JpegEncoderImageType jpeg_in_type;
int jpeg_size = 0;
volatile int has_alpha = FALSE;

2
server/dcc.h
View File

@ -66,8 +66,6 @@ struct DisplayChannelClient {
int zlib_level;
LzData lz_data;
LzContext *lz;
JpegData jpeg_data;
JpegEncoderContext *jpeg;
#ifdef USE_LZ4