pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-07 18:34:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dcc: remove group_id from compression functions

Browse Source 
The parameter was not used.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-02-08 05:11:27 +00:00
parent 448700bfb4
commit d56745df19
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/dcc.c
View File

@ -782,7 +782,7 @@ glz:
static int dcc_compress_image_lz(DisplayChannelClient *dcc, static int dcc_compress_image_lz(DisplayChannelClient *dcc,
SpiceImage *dest, SpiceBitmap *src, SpiceImage *dest, SpiceBitmap *src,
compress_send_data_t* o_comp_data, uint32_t group_id) compress_send_data_t* o_comp_data)
{ {
LzData *lz_data = &dcc->lz_data; LzData *lz_data = &dcc->lz_data;
LzContext *lz = dcc->lz; LzContext *lz = dcc->lz;
@ -843,8 +843,7 @@ static int dcc_compress_image_lz(DisplayChannelClient *dcc,
} }
static int dcc_compress_image_jpeg(DisplayChannelClient *dcc, SpiceImage *dest, static int dcc_compress_image_jpeg(DisplayChannelClient *dcc, SpiceImage *dest,
SpiceBitmap *src, compress_send_data_t* o_comp_data, SpiceBitmap *src, compress_send_data_t* o_comp_data)
uint32_t group_id)
{ {
JpegData *jpeg_data = &dcc->jpeg_data; JpegData *jpeg_data = &dcc->jpeg_data;
LzData *lz_data = &dcc->lz_data; LzData *lz_data = &dcc->lz_data;
@ -968,8 +967,7 @@ static int dcc_compress_image_jpeg(DisplayChannelClient *dcc, SpiceImage *dest,
#ifdef USE_LZ4 #ifdef USE_LZ4
static int dcc_compress_image_lz4(DisplayChannelClient *dcc, SpiceImage *dest, static int dcc_compress_image_lz4(DisplayChannelClient *dcc, SpiceImage *dest,
SpiceBitmap *src, compress_send_data_t* o_comp_data, SpiceBitmap *src, compress_send_data_t* o_comp_data)
uint32_t group_id)
{ {
Lz4Data *lz4_data = &dcc->lz4_data; Lz4Data *lz4_data = &dcc->lz4_data;
Lz4EncoderContext *lz4 = dcc->lz4; Lz4EncoderContext *lz4 = dcc->lz4;
@ -1015,8 +1013,7 @@ static int dcc_compress_image_lz4(DisplayChannelClient *dcc, SpiceImage *dest,
#endif #endif
static int dcc_compress_image_quic(DisplayChannelClient *dcc, SpiceImage *dest, static int dcc_compress_image_quic(DisplayChannelClient *dcc, SpiceImage *dest,
SpiceBitmap *src, compress_send_data_t* o_comp_data, SpiceBitmap *src, compress_send_data_t* o_comp_data)
uint32_t group_id)
{ {
QuicData *quic_data = &dcc->quic_data; QuicData *quic_data = &dcc->quic_data;
QuicContext *quic = dcc->quic; QuicContext *quic = dcc->quic;
@ -1094,7 +1091,6 @@ int dcc_compress_image(DisplayChannelClient *dcc,
DisplayChannel *display_channel = DCC_TO_DC(dcc); DisplayChannel *display_channel = DCC_TO_DC(dcc);
SpiceImageCompression image_compression = dcc->image_compression; SpiceImageCompression image_compression = dcc->image_compression;
int quic_compress = FALSE; int quic_compress = FALSE;
uint32_t group_id;
if ((image_compression == SPICE_IMAGE_COMPRESSION_OFF) || if ((image_compression == SPICE_IMAGE_COMPRESSION_OFF) ||
((src->y * src->stride) < MIN_SIZE_TO_COMPRESS)) { // TODO: change the size cond ((src->y * src->stride) < MIN_SIZE_TO_COMPRESS)) { // TODO: change the size cond
@ -1139,12 +1135,6 @@ int dcc_compress_image(DisplayChannelClient *dcc,
} }
} }
if (drawable != NULL) {
group_id = drawable->group_id;
} else {
group_id = red_worker_get_memslot(display_channel->common.worker)->internal_groupslot_id;
}
if (quic_compress) { if (quic_compress) {
#ifdef COMPRESS_DEBUG #ifdef COMPRESS_DEBUG
spice_info("QUIC compress"); spice_info("QUIC compress");
@ -1155,10 +1145,10 @@ int dcc_compress_image(DisplayChannelClient *dcc,
(image_compression == SPICE_IMAGE_COMPRESSION_AUTO_GLZ))) { (image_compression == SPICE_IMAGE_COMPRESSION_AUTO_GLZ))) {
// if we use lz for alpha, the stride can't be extra // if we use lz for alpha, the stride can't be extra
if (src->format != SPICE_BITMAP_FMT_RGBA || !bitmap_has_extra_stride(src)) { if (src->format != SPICE_BITMAP_FMT_RGBA || !bitmap_has_extra_stride(src)) {
return dcc_compress_image_jpeg(dcc, dest, src, o_comp_data, group_id); return dcc_compress_image_jpeg(dcc, dest, src, o_comp_data);
} }
} }
return dcc_compress_image_quic(dcc, dest, src, o_comp_data, group_id); return dcc_compress_image_quic(dcc, dest, src, o_comp_data);
} else { } else {
int glz; int glz;
int ret; int ret;
@ -1194,10 +1184,10 @@ int dcc_compress_image(DisplayChannelClient *dcc,
bitmap_fmt_is_rgb(src->format) && bitmap_fmt_is_rgb(src->format) &&
red_channel_client_test_remote_cap(&dcc->common.base, red_channel_client_test_remote_cap(&dcc->common.base,
SPICE_DISPLAY_CAP_LZ4_COMPRESSION)) { SPICE_DISPLAY_CAP_LZ4_COMPRESSION)) {
ret = dcc_compress_image_lz4(dcc, dest, src, o_comp_data, group_id); ret = dcc_compress_image_lz4(dcc, dest, src, o_comp_data);
} else } else
#endif #endif
ret = dcc_compress_image_lz(dcc, dest, src, o_comp_data, group_id); ret = dcc_compress_image_lz(dcc, dest, src, o_comp_data);
#ifdef COMPRESS_DEBUG #ifdef COMPRESS_DEBUG
spice_info("LZ LOCAL compress"); spice_info("LZ LOCAL compress");
#endif #endif