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

worker: simplify GlzDrawableInstanceItem fields name

Browse Source 
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Marc-André Lureau 2013-09-24 15:24:13 +02:00 committed by Frediano Ziglio
parent e8d8ff458b
commit 501c5ed8ca
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/dcc-encoders.c
View File

@ -323,7 +323,7 @@ static void glz_usr_free_image(GlzEncoderUsrContext *usr, GlzUsrImageContext *im
{
GlzData *lz_data = (GlzData *)usr;
GlzDrawableInstanceItem *glz_drawable_instance = (GlzDrawableInstanceItem *)image;
DisplayChannelClient *drawable_cc = glz_drawable_instance->red_glz_drawable->dcc;
DisplayChannelClient *drawable_cc = glz_drawable_instance->glz_drawable->dcc;
DisplayChannelClient *this_cc = SPICE_CONTAINEROF(lz_data, DisplayChannelClient, glz_data);
if (this_cc == drawable_cc) {
dcc_free_glz_drawable_instance(drawable_cc, glz_drawable_instance);

4
server/dcc-encoders.h
View File

@ -133,8 +133,8 @@ typedef struct RedGlzDrawable RedGlzDrawable;
struct GlzDrawableInstanceItem {
RingItem glz_link;
RingItem free_link;
GlzEncDictImageContext *glz_instance;
RedGlzDrawable *red_glz_drawable;
GlzEncDictImageContext *context;
RedGlzDrawable *glz_drawable;
};
struct RedGlzDrawable {

12
server/red_worker.c
View File

@ -2174,8 +2174,8 @@ static GlzDrawableInstanceItem *red_display_add_glz_drawable_instance(RedGlzDraw
ring_item_init(&ret->free_link);
ring_item_init(&ret->glz_link);
ring_add(&glz_drawable->instances, &ret->glz_link);
ret->glz_instance = NULL;
ret->red_glz_drawable = glz_drawable;
ret->context = NULL;
ret->glz_drawable = glz_drawable;
return ret;
}
@ -2193,9 +2193,9 @@ void dcc_free_glz_drawable_instance(DisplayChannelClient *dcc,
RedGlzDrawable *glz_drawable;
spice_assert(glz_drawable_instance);
spice_assert(glz_drawable_instance->red_glz_drawable);
spice_assert(glz_drawable_instance->glz_drawable);
glz_drawable = glz_drawable_instance->red_glz_drawable;
glz_drawable = glz_drawable_instance->glz_drawable;
spice_assert(glz_drawable->dcc == dcc);
spice_assert(glz_drawable->instances_count);
@ -2265,7 +2265,7 @@ static void dcc_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *dra
if (!ring_item_is_linked(&instance->free_link)) {
// the instance didn't get out from window yet
glz_enc_dictionary_remove_image(dcc->glz_dict->dict,
instance->glz_instance,
instance->context,
&dcc->glz_data.usr);
}
dcc_free_glz_drawable_instance(dcc, instance);
@ -2377,7 +2377,7 @@ static inline int red_glz_compress_image(DisplayChannelClient *dcc,
src->stride, glz_data->data.bufs_head->buf.bytes,
sizeof(glz_data->data.bufs_head->buf),
glz_drawable_instance,
&glz_drawable_instance->glz_instance);
&glz_drawable_instance->context);
stat_compress_add(&display_channel->glz_stat, start_time, src->stride * src->y, glz_size);

2
spice-common

@ -1 +1 @@
Subproject commit f471022453c20e7fcfb54b865d5fbfbcf71fa6c2
Subproject commit ac34b294c1a5367b061be3366a5eabd9b9377872