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

work on surface command

Browse Source
This commit is contained in:
Jay Sorg 2014-03-18 00:07:11 -07:00
parent 63032b000d
commit 6d7e315b0c
7 changed files with 115 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libxrdp/libxrdp.c
View File

@ -1309,3 +1309,72 @@ libxrdp_codec_jpeg_compress(struct xrdp_session *session,
width, height, stride, x, y,
cx, cy, quality, out_data, io_len);
}
/*****************************************************************************/
int EXPORT_CC
libxrdp_fastpath_send_surface(struct xrdp_session *session,
char* data_pad, int pad_bytes,
int data_bytes,
int destLeft, int destTop,
int destRight, int destBottom, int bpp,
int codecID, int width, int height)
{
struct stream ls;
struct stream *s;
struct xrdp_rdp *rdp;
int rv;
int sec_bytes;
int rdp_bytes;
int max_bytes;
int cmd_bytes;
LLOGLN(10, ("libxrdp_fastpath_init:"));
if ((session->client_info->use_fast_path & 1) == 0)
{
return 1;
}
max_bytes = session->client_info->max_fastpath_frag_bytes;
if (max_bytes < 32 * 1024)
{
max_bytes = 32 * 1024;
}
rdp = (struct xrdp_rdp *) (session->rdp);
rdp_bytes = xrdp_rdp_get_fastpath_bytes(rdp);
sec_bytes = xrdp_sec_get_fastpath_bytes(rdp->sec_layer);
cmd_bytes = 10 + 12;
if (data_bytes + rdp_bytes + sec_bytes + cmd_bytes > max_bytes)
{
return 1;
}
if (sec_bytes + rdp_bytes + cmd_bytes > pad_bytes)
{
return 1;
}
g_memset(&ls, 0, sizeof(ls));
s = &ls;
s->data = (data_pad + pad_bytes) - (rdp_bytes + sec_bytes + cmd_bytes);
s->sec_hdr = s->data;
s->rdp_hdr = s->sec_hdr + sec_bytes;
s->end = data_pad + pad_bytes + data_bytes;
s->p = s->data + (rdp_bytes + sec_bytes);
/* TS_SURFCMD_SET_SURF_BITS */
out_uint16_le(s, 0x0001); /* CMDTYPE_SET_SURFACE_BITS */
out_uint16_le(s, destLeft);
out_uint16_le(s, destTop);
out_uint16_le(s, destRight);
out_uint16_le(s, destBottom);
/* TS_ BITMAP_DATA_EX */
out_uint8(s, bpp);
out_uint8(s, 0);
out_uint8(s, 0);
out_uint8(s, codecID);
out_uint16_le(s, width);
out_uint16_le(s, height);
out_uint32_le(s, data_bytes);
/* 4 = FASTPATH_UPDATETYPE_SURFCMDS */
if (xrdp_rdp_send_fastpath(rdp, s, 4) != 0)
{
return 1;
}
return 0;
}

2
libxrdp/libxrdp.h
View File

@ -376,6 +376,8 @@ xrdp_rdp_init(struct xrdp_rdp* self, struct stream* s);
int APP_CC
xrdp_rdp_init_data(struct xrdp_rdp* self, struct stream* s);
int APP_CC
xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self);
int APP_CC
xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s);
int APP_CC
xrdp_rdp_recv(struct xrdp_rdp* self, struct stream* s, int* code);

7
libxrdp/libxrdpinc.h
View File

@ -235,5 +235,12 @@ libxrdp_codec_jpeg_compress(struct xrdp_session *session,
int stride, int x, int y,
int cx, int cy, int quality,
char *out_data, int *io_len);
int DEFAULT_CC
libxrdp_fastpath_send_surface(struct xrdp_session *session,
char* data_pad, int pad_bytes,
int data_bytes,
int destLeft, int dst_Top,
int destRight, int destBottom, int bpp,
int codecID, int width, int height);
#endif

12
libxrdp/xrdp_rdp.c
View File

@ -507,6 +507,18 @@ xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s,
return 0;
}
/*****************************************************************************/
/* returns the fastpath rdp byte count */
int APP_CC
xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self)
{
if (self->client_info.rdp_compression)
{
return 4;
}
return 3;
}
/*****************************************************************************/
int APP_CC
xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s)

17
xrdp/xrdp_encoder.c
View File

@ -162,7 +162,7 @@ process_enc(struct xrdp_mm *self, XRDP_ENC_DATA *enc)
LLOGLN(0, ("process_enc: error"));
return 1;
}
out_data = (char *) g_malloc(out_data_bytes, 0);
out_data = (char *) g_malloc(out_data_bytes + 256, 0);
if (out_data == 0)
{
LLOGLN(0, ("process_enc: error"));
@ -172,11 +172,20 @@ process_enc(struct xrdp_mm *self, XRDP_ENC_DATA *enc)
enc->width, enc->height,
enc->width * 4, x, y, cx, cy,
quality,
out_data, &out_data_bytes);
out_data + 256, &out_data_bytes);
if (error < 0)
{
LLOGLN(0, ("process_enc: jpeg error %d bytes %d",
error, out_data_bytes));
g_free(out_data);
return 1;
}
LLOGLN(10, ("jpeg error %d bytes %d", error, out_data_bytes));
enc_done = g_malloc(sizeof(XRDP_ENC_DATA_DONE), 1);
enc_done = (XRDP_ENC_DATA_DONE *)
g_malloc(sizeof(XRDP_ENC_DATA_DONE), 1);
enc_done->comp_bytes = out_data_bytes;
enc_done->comp_data = out_data;
enc_done->pad_bytes = 256;
enc_done->comp_pad_data = out_data;
enc_done->enc = enc;
enc_done->last = index == (enc->num_crects - 1);
enc_done->index = index;

12
xrdp/xrdp_mm.c
View File

@ -1980,9 +1980,17 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
g_snprintf(text, 255, "/tmp/jj0x%8.8x.jpg", jj);
jj++;
ii = g_file_open(text);
g_file_write(ii, enc_done->comp_data, enc_done->comp_bytes);
g_file_write(ii, enc_done->comp_pad_data + enc_done->pad_bytes, enc_done->comp_bytes);
g_file_close(ii);
}
libxrdp_fastpath_send_surface(self->wm->session,
enc_done->comp_pad_data,
enc_done->pad_bytes,
enc_done->comp_bytes,
0, 0, 0, 0, 32, 99, 0, 0);
/* free enc_done */
if (enc_done->last)
{
@ -1991,7 +1999,7 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
g_free(enc_done->enc->crects);
g_free(enc_done->enc);
}
g_free(enc_done->comp_data);
g_free(enc_done->comp_pad_data);
g_free(enc_done);
tc_mutex_lock(self->mutex);
enc_done = (XRDP_ENC_DATA_DONE*)

3
xrdp/xrdp_types.h
View File

@ -629,7 +629,8 @@ typedef struct xrdp_enc_data XRDP_ENC_DATA;
struct xrdp_enc_data_done
{
int comp_bytes;
char *comp_data;
int pad_bytes;
char *comp_pad_data;
struct xrdp_enc_data *enc;
int last; /* true is this is last message for enc */
int index; /* depends on codec */