From b7b46b812395cf3a67b1e36f0fbf1386f4372443 Mon Sep 17 00:00:00 2001
From: David Fort <contact@hardening-consulting.com>
Date: Mon, 20 Mar 2023 14:51:52 +0100
Subject: [PATCH] [codecs] make progressive honor threading flags

Progressive codec was not honoring the threading flags in settings like does
remoteFX, so even when no multiple threads decoding was asked, progressive was
using multiple threads anyway. This patch fixes it.
---
 include/freerdp/codec/progressive.h |  2 ++
 libfreerdp/codec/progressive.c      | 41 +++++++++++++----------------
 libfreerdp/core/codecs.c            |  8 +++---
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/include/freerdp/codec/progressive.h b/include/freerdp/codec/progressive.h
index e1a37e56e..7d9c54e25 100644
--- a/include/freerdp/codec/progressive.h
+++ b/include/freerdp/codec/progressive.h
@@ -58,6 +58,8 @@ extern "C"
 	FREERDP_API BOOL progressive_context_reset(PROGRESSIVE_CONTEXT* progressive);
 
 	FREERDP_API PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor);
+	FREERDP_API PROGRESSIVE_CONTEXT* progressive_context_new_ex(BOOL Compressor,
+	                                                            UINT32 ThreadingFlags);
 	FREERDP_API void progressive_context_free(PROGRESSIVE_CONTEXT* progressive);
 
 #ifdef __cplusplus
diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c
index 5c82dbe49..1e8675a09 100644
--- a/libfreerdp/codec/progressive.c
+++ b/libfreerdp/codec/progressive.c
@@ -536,17 +536,20 @@ static BOOL progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* surfac
 
 	t = &surface->tiles[zIdx];
 
+	t->blockType = tile->blockType;
+	t->blockLen = tile->blockLen;
+	t->quantIdxY = tile->quantIdxY;
+	t->quantIdxCb = tile->quantIdxCb;
+	t->quantIdxCr = tile->quantIdxCr;
+	t->xIdx = tile->xIdx;
+	t->yIdx = tile->yIdx;
+	t->flags = tile->flags;
+	t->quality = tile->quality;
+	t->x = tile->xIdx * t->width;
+	t->y = tile->yIdx * t->height;
+
 	if (upgrade)
 	{
-		t->blockType = tile->blockType;
-		t->blockLen = tile->blockLen;
-		t->quantIdxY = tile->quantIdxY;
-		t->quantIdxCb = tile->quantIdxCb;
-		t->quantIdxCr = tile->quantIdxCr;
-		t->xIdx = tile->xIdx;
-		t->yIdx = tile->yIdx;
-		t->flags = tile->flags;
-		t->quality = tile->quality;
 		t->ySrlLen = tile->ySrlLen;
 		t->yRawLen = tile->yRawLen;
 		t->cbSrlLen = tile->cbSrlLen;
@@ -559,20 +562,9 @@ static BOOL progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* surfac
 		t->cbRawData = tile->cbRawData;
 		t->crSrlData = tile->crSrlData;
 		t->crRawData = tile->crRawData;
-		t->x = tile->xIdx * t->width;
-		t->y = tile->yIdx * t->height;
 	}
 	else
 	{
-		t->blockType = tile->blockType;
-		t->blockLen = tile->blockLen;
-		t->quantIdxY = tile->quantIdxY;
-		t->quantIdxCb = tile->quantIdxCb;
-		t->quantIdxCr = tile->quantIdxCr;
-		t->xIdx = tile->xIdx;
-		t->yIdx = tile->yIdx;
-		t->flags = tile->flags;
-		t->quality = tile->quality;
 		t->yLen = tile->yLen;
 		t->cbLen = tile->cbLen;
 		t->crLen = tile->crLen;
@@ -581,8 +573,6 @@ static BOOL progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* surfac
 		t->cbData = tile->cbData;
 		t->crData = tile->crData;
 		t->tailData = tile->tailData;
-		t->x = tile->xIdx * t->width;
-		t->y = tile->yIdx * t->height;
 	}
 
 	if (region->usedTiles >= region->numTiles)
@@ -2792,6 +2782,11 @@ BOOL progressive_context_reset(PROGRESSIVE_CONTEXT* progressive)
 }
 
 PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor)
+{
+	return progressive_context_new_ex(Compressor, 0);
+}
+
+PROGRESSIVE_CONTEXT* progressive_context_new_ex(BOOL Compressor, UINT32 ThreadingFlags)
 {
 	PROGRESSIVE_CONTEXT* progressive = (PROGRESSIVE_CONTEXT*)calloc(1, sizeof(PROGRESSIVE_CONTEXT));
 
@@ -2803,7 +2798,7 @@ PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor)
 	progressive->log = WLog_Get(TAG);
 	if (!progressive->log)
 		goto fail;
-	progressive->rfx_context = rfx_context_new(Compressor);
+	progressive->rfx_context = rfx_context_new_ex(Compressor, ThreadingFlags);
 	if (!progressive->rfx_context)
 		goto fail;
 	progressive->buffer = Stream_New(NULL, 1024);
diff --git a/libfreerdp/core/codecs.c b/libfreerdp/core/codecs.c
index 900689169..641977a4f 100644
--- a/libfreerdp/core/codecs.c
+++ b/libfreerdp/core/codecs.c
@@ -126,11 +126,11 @@ BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width
 		}
 	}
 
+	UINT32 threadingFlags =
+	    freerdp_settings_get_uint32(codecs->context->settings, FreeRDP_ThreadingFlags);
 	if ((flags & FREERDP_CODEC_REMOTEFX))
 	{
-		const UINT32 ThreadingFlags =
-		    freerdp_settings_get_uint32(codecs->context->settings, FreeRDP_ThreadingFlags);
-		if (!(codecs->rfx = rfx_context_new_ex(FALSE, ThreadingFlags)))
+		if (!(codecs->rfx = rfx_context_new_ex(FALSE, threadingFlags)))
 		{
 			WLog_ERR(TAG, "Failed to create rfx codec context");
 			return FALSE;
@@ -152,7 +152,7 @@ BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width
 
 	if ((flags & FREERDP_CODEC_PROGRESSIVE))
 	{
-		if (!(codecs->progressive = progressive_context_new(FALSE)))
+		if (!(codecs->progressive = progressive_context_new_ex(FALSE, threadingFlags)))
 		{
 			WLog_ERR(TAG, "Failed to create progressive codec context");
 			return FALSE;