mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GFX: Relegate some logs to LOG_DEVEL (#2939)

Browse Source
This commit is contained in:
metalefty 2024-02-08 21:09:09 +09:00 committed by GitHub
parent 8027a42497
commit 76242bbf63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xrdp/xrdp_egfx.c
View File

@ -105,7 +105,7 @@ xrdp_egfx_create_surface(struct xrdp_egfx_bulk *bulk, int surface_id,
int bytes; int bytes;
struct stream *s; struct stream *s;
LOG(LOG_LEVEL_TRACE, "xrdp_egfx_create_surface:"); LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_egfx_create_surface:");
make_stream(s); make_stream(s);
init_stream(s, 8192); init_stream(s, 8192);
/* RDP_SEGMENTED_DATA */ /* RDP_SEGMENTED_DATA */
@ -135,11 +135,11 @@ xrdp_egfx_send_create_surface(struct xrdp_egfx *egfx, int surface_id,
int error; int error;
struct stream *s; struct stream *s;
LOG(LOG_LEVEL_TRACE, "xrdp_egfx_send_create_surface:"); LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_egfx_send_create_surface:");
s = xrdp_egfx_create_surface(egfx->bulk, surface_id, width, height, s = xrdp_egfx_create_surface(egfx->bulk, surface_id, width, height,
pixel_format); pixel_format);
error = xrdp_egfx_send_s(egfx, s); error = xrdp_egfx_send_s(egfx, s);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_send_create_surface: xrdp_egfx_send_s " LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_send_create_surface: xrdp_egfx_send_s "
"error %d", error); "error %d", error);
free_stream(s); free_stream(s);
return error; return error;
@ -181,7 +181,7 @@ xrdp_egfx_send_delete_surface(struct xrdp_egfx *egfx, int surface_id)
LOG(LOG_LEVEL_TRACE, "xrdp_egfx_send_delete_surface:"); LOG(LOG_LEVEL_TRACE, "xrdp_egfx_send_delete_surface:");
s = xrdp_egfx_delete_surface(egfx->bulk, surface_id); s = xrdp_egfx_delete_surface(egfx->bulk, surface_id);
error = xrdp_egfx_send_s(egfx, s); error = xrdp_egfx_send_s(egfx, s);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_send_delete_surface: xrdp_egfx_send_s " LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_send_delete_surface: xrdp_egfx_send_s "
"error %d", error); "error %d", error);
free_stream(s); free_stream(s);
return error; return error;
@ -538,7 +538,7 @@ xrdp_egfx_wire_to_surface1(struct xrdp_egfx_bulk *bulk, int surface_id,
/* RDP8_BULK_ENCODED_DATA */ /* RDP8_BULK_ENCODED_DATA */
out_uint8(s, PACKET_COMPR_TYPE_RDP8); /* header */ out_uint8(s, PACKET_COMPR_TYPE_RDP8); /* header */
out_uint8a(s, bitmap_data8 + index, segment_size); out_uint8a(s, bitmap_data8 + index, segment_size);
LOG(LOG_LEVEL_DEBUG, " segment index %d segment_size %d", LOG_DEVEL(LOG_LEVEL_DEBUG, " segment index %d segment_size %d",
segment_count, segment_size); segment_count, segment_size);
index += segment_size; index += segment_size;
segment_count++; segment_count++;
@ -546,7 +546,7 @@ xrdp_egfx_wire_to_surface1(struct xrdp_egfx_bulk *bulk, int surface_id,
s_mark_end(s); s_mark_end(s);
s_pop_layer(s, iso_hdr); s_pop_layer(s, iso_hdr);
out_uint16_le(s, segment_count); out_uint16_le(s, segment_count);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_wire_to_surface1: segment_count %d", LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_wire_to_surface1: segment_count %d",
segment_count); segment_count);
return s; return s;
} }
@ -561,12 +561,12 @@ xrdp_egfx_send_wire_to_surface1(struct xrdp_egfx *egfx, int surface_id,
int error; int error;
struct stream *s; struct stream *s;
LOG(LOG_LEVEL_TRACE, "xrdp_egfx_send_wire_to_surface1:"); LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_egfx_send_wire_to_surface1:");
s = xrdp_egfx_wire_to_surface1(egfx->bulk, surface_id, codec_id, s = xrdp_egfx_wire_to_surface1(egfx->bulk, surface_id, codec_id,
pixel_format, dest_rect, pixel_format, dest_rect,
bitmap_data, bitmap_data_length); bitmap_data, bitmap_data_length);
error = xrdp_egfx_send_s(egfx, s); error = xrdp_egfx_send_s(egfx, s);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_send_wire_to_surface1: xrdp_egfx_send_s " LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_send_wire_to_surface1: xrdp_egfx_send_s "
"error %d", error); "error %d", error);
free_stream(s); free_stream(s);
return error; return error;
@ -586,7 +586,7 @@ xrdp_egfx_wire_to_surface2(struct xrdp_egfx_bulk *bulk, int surface_id,
struct stream *s; struct stream *s;
char *bitmap_data8; char *bitmap_data8;
LOG(LOG_LEVEL_TRACE, "xrdp_egfx_wire_to_surface2:"); LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_egfx_wire_to_surface2:");
make_stream(s); make_stream(s);
bytes = bitmap_data_length + 8192; bytes = bitmap_data_length + 8192;
bytes += 5 * (bitmap_data_length / MAX_PART_SIZE); bytes += 5 * (bitmap_data_length / MAX_PART_SIZE);
@ -623,7 +623,7 @@ xrdp_egfx_wire_to_surface2(struct xrdp_egfx_bulk *bulk, int surface_id,
/* RDP8_BULK_ENCODED_DATA */ /* RDP8_BULK_ENCODED_DATA */
out_uint8(s, PACKET_COMPR_TYPE_RDP8); /* header */ out_uint8(s, PACKET_COMPR_TYPE_RDP8); /* header */
out_uint8a(s, bitmap_data8 + index, segment_size); out_uint8a(s, bitmap_data8 + index, segment_size);
LOG(LOG_LEVEL_DEBUG, " segment index %d segment_size %d", LOG_DEVEL(LOG_LEVEL_DEBUG, " segment index %d segment_size %d",
segment_count, segment_size); segment_count, segment_size);
index += segment_size; index += segment_size;
segment_count++; segment_count++;
@ -631,7 +631,7 @@ xrdp_egfx_wire_to_surface2(struct xrdp_egfx_bulk *bulk, int surface_id,
s_mark_end(s); s_mark_end(s);
s_pop_layer(s, iso_hdr); s_pop_layer(s, iso_hdr);
out_uint16_le(s, segment_count); out_uint16_le(s, segment_count);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_wire_to_surface2: segment_count %d", LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_wire_to_surface2: segment_count %d",
segment_count); segment_count);
return s; return s;
} }
@ -651,7 +651,7 @@ xrdp_egfx_send_wire_to_surface2(struct xrdp_egfx *egfx, int surface_id,
codec_context_id, pixel_format, codec_context_id, pixel_format,
bitmap_data, bitmap_data_length); bitmap_data, bitmap_data_length);
error = xrdp_egfx_send_s(egfx, s); error = xrdp_egfx_send_s(egfx, s);
LOG(LOG_LEVEL_DEBUG, "xrdp_egfx_send_wire_to_surface2: xrdp_egfx_send_s " LOG_DEVEL(LOG_LEVEL_DEBUG, "xrdp_egfx_send_wire_to_surface2: xrdp_egfx_send_s "
"error %d", error); "error %d", error);
free_stream(s); free_stream(s);
return error; return error;