diff options
| author | Speidy <speidy@gmail.com> | 2016-12-12 15:51:39 -0800 |
|---|---|---|
| committer | Speidy <speidy@gmail.com> | 2016-12-12 15:51:39 -0800 |
| commit | a0cf6030df8364d4a5ab775a8e91ccfeb0ef4209 (patch) | |
| tree | 57864869313a3be01062333613b4b057952b7534 /xrdp/xrdp_encoder.c | |
| parent | 1ef5c2412c07b108bcf5d2984d576578ffb83ef8 (diff) | |
| parent | 5966de4ee2b8cf14a86b36f47b8015fc17f026ea (diff) | |
| download | xrdp-proprietary-a0cf6030df8364d4a5ab775a8e91ccfeb0ef4209.tar.gz xrdp-proprietary-a0cf6030df8364d4a5ab775a8e91ccfeb0ef4209.zip | |
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into surface_cmds
Diffstat (limited to 'xrdp/xrdp_encoder.c')
| -rw-r--r-- | xrdp/xrdp_encoder.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c index 7f5ace1e..0af0b85e 100644 --- a/xrdp/xrdp_encoder.c +++ b/xrdp/xrdp_encoder.c @@ -42,8 +42,10 @@ /*****************************************************************************/ static int process_enc_jpg(struct xrdp_encoder *self, XRDP_ENC_DATA *enc); +#ifdef XRDP_RFXCODEC static int process_enc_rfx(struct xrdp_encoder *self, XRDP_ENC_DATA *enc); +#endif static int process_enc_h264(struct xrdp_encoder *self, XRDP_ENC_DATA *enc); @@ -82,6 +84,7 @@ xrdp_encoder_create(struct xrdp_mm *mm) (32 << 24) | (3 << 16) | (8 << 12) | (8 << 8) | (8 << 4) | 8; self->process_enc = process_enc_jpg; } +#ifdef XRDP_RFXCODEC else if (client_info->rfx_codec_id != 0) { LLOGLN(0, ("xrdp_encoder_create: starting rfx codec session")); @@ -89,13 +92,11 @@ xrdp_encoder_create(struct xrdp_mm *mm) self->in_codec_mode = 1; client_info->capture_code = 2; self->process_enc = process_enc_rfx; -#ifdef XRDP_RFXCODEC - self->codec_handle = - rfxcodec_encode_create(mm->wm->screen->width, - mm->wm->screen->height, - RFX_FORMAT_YUV, 0); -#endif + self->codec_handle = rfxcodec_encode_create(mm->wm->screen->width, + mm->wm->screen->height, + RFX_FORMAT_YUV, 0); } +#endif else if (client_info->h264_codec_id != 0) { LLOGLN(0, ("xrdp_encoder_create: starting h264 codec session")); @@ -291,7 +292,6 @@ process_enc_jpg(struct xrdp_encoder *self, XRDP_ENC_DATA *enc) } #ifdef XRDP_RFXCODEC - /*****************************************************************************/ /* called from encoder thread */ static int @@ -394,17 +394,6 @@ process_enc_rfx(struct xrdp_encoder *self, XRDP_ENC_DATA *enc) return 0; } - -#else - -/*****************************************************************************/ -/* called from encoder thread */ -static int -process_enc_rfx(struct xrdp_encoder *self, XRDP_ENC_DATA *enc) -{ - return 0; -} - #endif /*****************************************************************************/ |