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

Fix #7586: Update size of tile cache if required. (#7602)

Browse Source
This commit is contained in:
akallabeth 2022-01-28 09:07:27 +01:00 committed by GitHub
parent db1ee0cae6
commit 4a29b29a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libfreerdp/codec/progressive.c
View File

@ -23,6 +23,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include <winpr/assert.h>
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/print.h> #include <winpr/print.h>
#include <winpr/bitstream.h> #include <winpr/bitstream.h>
@ -436,6 +437,36 @@ static INLINE BOOL progressive_tile_allocate(RFX_PROGRESSIVE_TILE* tile)
return rc; return rc;
} }
static BOOL progressive_allocate_tile_cache(PROGRESSIVE_SURFACE_CONTEXT* surface)
{
size_t oldIndex;
WINPR_ASSERT(surface);
WINPR_ASSERT(surface->gridSize > 0);
oldIndex = surface->gridSize;
if (surface->tiles)
surface->gridSize *= 2;
{
void* tmp = realloc(surface->tiles, surface->gridSize * sizeof(RFX_PROGRESSIVE_TILE));
if (!tmp)
return FALSE;
surface->tiles = tmp;
memset(&surface->tiles[oldIndex], 0,
(surface->gridSize - oldIndex) * sizeof(RFX_PROGRESSIVE_TILE));
}
{
void* tmp = realloc(surface->updatedTileIndices, surface->gridSize * sizeof(UINT32));
if (!tmp)
return FALSE;
surface->updatedTileIndices = tmp;
memset(&surface->updatedTileIndices[oldIndex], 0,
(surface->gridSize - oldIndex) * sizeof(UINT32));
}
return TRUE;
}
static PROGRESSIVE_SURFACE_CONTEXT* progressive_surface_context_new(UINT16 surfaceId, UINT32 width, static PROGRESSIVE_SURFACE_CONTEXT* progressive_surface_context_new(UINT16 surfaceId, UINT32 width,
UINT32 height) UINT32 height)
{ {
@ -452,14 +483,10 @@ static PROGRESSIVE_SURFACE_CONTEXT* progressive_surface_context_new(UINT16 surfa
surface->gridWidth = (width + (64 - width % 64)) / 64; surface->gridWidth = (width + (64 - width % 64)) / 64;
surface->gridHeight = (height + (64 - height % 64)) / 64; surface->gridHeight = (height + (64 - height % 64)) / 64;
surface->gridSize = surface->gridWidth * surface->gridHeight; surface->gridSize = surface->gridWidth * surface->gridHeight;
surface->tiles = (RFX_PROGRESSIVE_TILE*)calloc(surface->gridSize, sizeof(RFX_PROGRESSIVE_TILE));
surface->updatedTileIndices = (UINT32*)calloc(surface->gridSize, sizeof(UINT32));
if (!surface->tiles || !surface->updatedTileIndices) if (!progressive_allocate_tile_cache(surface))
{ {
free(surface->updatedTileIndices); progressive_surface_context_free(surface);
free(surface->tiles);
free(surface);
return NULL; return NULL;
} }
for (x = 0; x < surface->gridSize; x++) for (x = 0; x < surface->gridSize; x++)
@ -551,8 +578,8 @@ static BOOL progressive_surface_tile_replace(PROGRESSIVE_SURFACE_CONTEXT* surfac
} }
if (surface->numUpdatedTiles >= surface->gridSize) if (surface->numUpdatedTiles >= surface->gridSize)
{ {
WLog_ERR(TAG, "Invalid total tile count, maximum %" PRIu32, surface->gridSize); if (!progressive_allocate_tile_cache(surface))
return FALSE; return FALSE;
} }
region->tiles[region->usedTiles++] = t; region->tiles[region->usedTiles++] = t;