mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6929 from sss123next/revert_rfx_context_new_signature 

reverted old signature for rfx_context_new
This commit is contained in:
David Fort 2021-03-31 09:10:40 +02:00 committed by GitHub
parent 6b76ac9545 0bf5ebb68a
commit 36ffb3a1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/codec/rfx.h
View File

@ -199,7 +199,8 @@ extern "C"
FREERDP_API BOOL rfx_context_reset(RFX_CONTEXT* context, UINT32 width, UINT32 height); FREERDP_API BOOL rfx_context_reset(RFX_CONTEXT* context, UINT32 width, UINT32 height);
FREERDP_API RFX_CONTEXT* rfx_context_new(BOOL encoder, UINT32 ThreadingFlags); FREERDP_API RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags);
FREERDP_API RFX_CONTEXT* rfx_context_new(BOOL encoder);
FREERDP_API void rfx_context_free(RFX_CONTEXT* context); FREERDP_API void rfx_context_free(RFX_CONTEXT* context);
#ifdef __cplusplus #ifdef __cplusplus

2
libfreerdp/codec/progressive.c
View File

@ -2603,7 +2603,7 @@ PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor)
progressive->log = WLog_Get(TAG); progressive->log = WLog_Get(TAG);
if (!progressive->log) if (!progressive->log)
goto fail; goto fail;
progressive->rfx_context = rfx_context_new(Compressor, 0); progressive->rfx_context = rfx_context_new(Compressor);
if (!progressive->rfx_context) if (!progressive->rfx_context)
goto fail; goto fail;
progressive->buffer = Stream_New(NULL, 1024); progressive->buffer = Stream_New(NULL, 1024);

7
libfreerdp/codec/rfx.c
View File

@ -195,7 +195,12 @@ static void rfx_encoder_tile_free(void* obj)
free(obj); free(obj);
} }
RFX_CONTEXT* rfx_context_new(BOOL encoder, UINT32 ThreadingFlags) RFX_CONTEXT* rfx_context_new(BOOL encoder)
{
return rfx_context_new_ex(encoder, 0);
}
RFX_CONTEXT* rfx_context_new_ex(BOOL encoder, UINT32 ThreadingFlags)
{ {
HKEY hKey; HKEY hKey;
LONG status; LONG status;

2
libfreerdp/codec/test/TestFreeRDPCodecRemoteFX.c
View File

@ -853,7 +853,7 @@ int TestFreeRDPCodecRemoteFX(int argc, char* argv[])
/* use default threading options here, pass zero as /* use default threading options here, pass zero as
* ThreadingFlags */ * ThreadingFlags */
context = rfx_context_new(FALSE, 0); context = rfx_context_new(FALSE);
if (!context) if (!context)
goto fail; goto fail;

2
libfreerdp/core/codecs.c
View File

@ -65,7 +65,7 @@ BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width
if ((flags & FREERDP_CODEC_REMOTEFX)) if ((flags & FREERDP_CODEC_REMOTEFX))
{ {
rfx_context_free(codecs->rfx); rfx_context_free(codecs->rfx);
if (!(codecs->rfx = rfx_context_new(FALSE, codecs->context->settings->ThreadingFlags))) if (!(codecs->rfx = rfx_context_new_ex(FALSE, codecs->context->settings->ThreadingFlags)))
{ {
WLog_ERR(TAG, "Failed to create rfx codec context"); WLog_ERR(TAG, "Failed to create rfx codec context");
return FALSE; return FALSE;

2
server/Mac/mf_peer.c
View File

@ -158,7 +158,7 @@ static BOOL mf_peer_context_new(freerdp_peer* client, mfPeerContext* context)
if (!(context->info = mf_info_get_instance())) if (!(context->info = mf_info_get_instance()))
return FALSE; return FALSE;
if (!(context->rfx_context = rfx_context_new(TRUE, client->settings->ThreadingFlags))) if (!(context->rfx_context = rfx_context_new_ex(TRUE, client->settings->ThreadingFlags)))
goto fail_rfx_context; goto fail_rfx_context;
context->rfx_context->mode = RLGR3; context->rfx_context->mode = RLGR3;

2
server/Sample/sfreerdp.c
View File

@ -58,7 +58,7 @@ static BOOL test_dump_rfx_realtime = TRUE;
static BOOL test_peer_context_new(freerdp_peer* client, rdpContext* ctx) static BOOL test_peer_context_new(freerdp_peer* client, rdpContext* ctx)
{ {
testPeerContext* context = (testPeerContext*)ctx; testPeerContext* context = (testPeerContext*)ctx;
if (!(context->rfx_context = rfx_context_new(TRUE, client->settings->ThreadingFlags))) if (!(context->rfx_context = rfx_context_new_ex(TRUE, client->settings->ThreadingFlags)))
goto fail_rfx_context; goto fail_rfx_context;
if (!rfx_context_reset(context->rfx_context, SAMPLE_SERVER_DEFAULT_WIDTH, if (!rfx_context_reset(context->rfx_context, SAMPLE_SERVER_DEFAULT_WIDTH,

2
server/Windows/wf_update.c
View File

@ -188,7 +188,7 @@ void wf_update_encoder_reset(wfInfo* wfi)
else else
{ {
/* TODO: pass ThreadingFlags somehow */ /* TODO: pass ThreadingFlags somehow */
wfi->rfx_context = rfx_context_new(TRUE, 0); wfi->rfx_context = rfx_context_new(TRUE);
wfi->rfx_context->mode = RLGR3; wfi->rfx_context->mode = RLGR3;
wfi->rfx_context->width = wfi->servscreen_width; wfi->rfx_context->width = wfi->servscreen_width;
wfi->rfx_context->height = wfi->servscreen_height; wfi->rfx_context->height = wfi->servscreen_height;

2
server/shadow/shadow_encoder.c
View File

@ -132,7 +132,7 @@ static int shadow_encoder_uninit_grid(rdpShadowEncoder* encoder)
static int shadow_encoder_init_rfx(rdpShadowEncoder* encoder) static int shadow_encoder_init_rfx(rdpShadowEncoder* encoder)
{ {
if (!encoder->rfx) if (!encoder->rfx)
encoder->rfx = rfx_context_new(TRUE, encoder->server->settings->ThreadingFlags); encoder->rfx = rfx_context_new_ex(TRUE, encoder->server->settings->ThreadingFlags);
if (!encoder->rfx) if (!encoder->rfx)
goto fail; goto fail;