pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-30 17:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dcc: Rework COMPRESS_DEBUG macro

Browse Source 
Rather than using
 #ifdef COMPRESS_DEBUG
   spice_info(...);
 #endif

we can #define COMPRESS_DEBUG to spice_debug() or to do nothing for a
slight readability improvement. This opportunity is used to replace
these spice_debug() calls with g_debug(). The "do nothing" macro is a bit
convoluted to ensure that we will have a compile-time check for our
g_debug args.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Christophe Fergeau 2018-07-12 18:09:50 +02:00
parent 48179332d9
commit 35488f1562
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/image-encoders.c
View File

@ -32,6 +32,14 @@
#define MAX_GLZ_DRAWABLE_INSTANCES 2
#if 0
#define COMPRESS_DEBUG(...) g_debug(__VA_ARGS__)
#else
#define COMPRESS_DEBUG(...) G_STMT_START { \
if (0) g_debug(__VA_ARGS__); \
} G_STMT_END
#endif
typedef struct RedGlzDrawable RedGlzDrawable;
typedef struct GlzDrawableInstanceItem GlzDrawableInstanceItem;
@ -837,9 +845,7 @@ bool image_encoders_compress_quic(ImageEncoders *enc, SpiceImage *dest,
stat_start_time_t start_time;
stat_start_time_init(&start_time, &enc->shared_data->quic_stat);
#ifdef COMPRESS_DEBUG
spice_debug("QUIC compress");
#endif
COMPRESS_DEBUG("QUIC compress");
switch (src->format) {
case SPICE_BITMAP_FMT_32BIT:
@ -926,9 +932,7 @@ bool image_encoders_compress_lz(ImageEncoders *enc,
stat_start_time_t start_time;
stat_start_time_init(&start_time, &enc->shared_data->lz_stat);
#ifdef COMPRESS_DEBUG
spice_debug("LZ LOCAL compress");
#endif
COMPRESS_DEBUG("LZ LOCAL compress");
encoder_data_init(&lz_data->data);
@ -997,9 +1001,7 @@ bool image_encoders_compress_jpeg(ImageEncoders *enc, SpiceImage *dest,
stat_start_time_t start_time;
stat_start_time_init(&start_time, &enc->shared_data->jpeg_alpha_stat);
#ifdef COMPRESS_DEBUG
spice_debug("JPEG compress");
#endif
COMPRESS_DEBUG("JPEG compress");
switch (src->format) {
case SPICE_BITMAP_FMT_16BIT:
@ -1114,9 +1116,7 @@ bool image_encoders_compress_lz4(ImageEncoders *enc, SpiceImage *dest,
stat_start_time_t start_time;
stat_start_time_init(&start_time, &enc->shared_data->lz4_stat);
#ifdef COMPRESS_DEBUG
spice_debug("LZ4 compress");
#endif
COMPRESS_DEBUG("LZ4 compress");
encoder_data_init(&lz4_data->data);
@ -1226,9 +1226,7 @@ bool image_encoders_compress_glz(ImageEncoders *enc,
int glz_size;
int zlib_size;
#ifdef COMPRESS_DEBUG
spice_debug("LZ global compress fmt=%d", src->format);
#endif
COMPRESS_DEBUG("LZ global compress fmt=%d", src->format);
if ((src->x * src->y) >= glz_enc_dictionary_get_size(enc->glz_dict->dict)) {
return FALSE;