morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[codec,rfx] inline and restrict

Browse Source
This commit is contained in:
akallabeth
2024-05-29 23:48:22 +02:00
parent cefe7866a1
commit 4b93a9fffa
12 changed files with 216 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

234
libfreerdp/codec/rfx.c
View File

@@ -75,10 +75,11 @@
*/ */
static const UINT32 rfx_default_quantization_values[] = { 6, 6, 6, 6, 7, 7, 8, 8, 8, 9 }; static const UINT32 rfx_default_quantization_values[] = { 6, 6, 6, 6, 7, 7, 8, 8, 8, 9 };
static INLINE BOOL rfx_write_progressive_tile_simple(RFX_CONTEXT* rfx, wStream* s, static INLINE BOOL rfx_write_progressive_tile_simple(RFX_CONTEXT* WINPR_RESTRICT rfx,
const RFX_TILE* tile); wStream* WINPR_RESTRICT s,
const RFX_TILE* WINPR_RESTRICT tile);
static void rfx_profiler_create(RFX_CONTEXT* context) static INLINE void rfx_profiler_create(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
if (!context || !context->priv) if (!context || !context->priv)
return; return;
@@ -99,7 +100,7 @@ static void rfx_profiler_create(RFX_CONTEXT* context)
PROFILER_CREATE(context->priv->prof_rfx_encode_format_rgb, "rfx_encode_format_rgb") PROFILER_CREATE(context->priv->prof_rfx_encode_format_rgb, "rfx_encode_format_rgb")
} }
static void rfx_profiler_free(RFX_CONTEXT* context) static INLINE void rfx_profiler_free(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
if (!context || !context->priv) if (!context || !context->priv)
return; return;
@@ -120,7 +121,7 @@ static void rfx_profiler_free(RFX_CONTEXT* context)
PROFILER_FREE(context->priv->prof_rfx_encode_format_rgb) PROFILER_FREE(context->priv->prof_rfx_encode_format_rgb)
} }
static void rfx_profiler_print(RFX_CONTEXT* context) static INLINE void rfx_profiler_print(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
if (!context || !context->priv) if (!context || !context->priv)
return; return;
@@ -144,7 +145,7 @@ static void rfx_profiler_print(RFX_CONTEXT* context)
PROFILER_PRINT_FOOTER PROFILER_PRINT_FOOTER
} }
static void rfx_tile_init(void* obj) static INLINE void rfx_tile_init(void* obj)
{ {
RFX_TILE* tile = (RFX_TILE*)obj; RFX_TILE* tile = (RFX_TILE*)obj;
if (tile) if (tile)
@@ -160,7 +161,7 @@ static void rfx_tile_init(void* obj)
} }
} }
static void* rfx_decoder_tile_new(const void* val) static INLINE void* rfx_decoder_tile_new(const void* val)
{ {
const size_t size = 4 * 64 * 64; const size_t size = 4 * 64 * 64;
RFX_TILE* tile = NULL; RFX_TILE* tile = NULL;
@@ -179,7 +180,7 @@ static void* rfx_decoder_tile_new(const void* val)
return tile; return tile;
} }
static void rfx_decoder_tile_free(void* obj) static INLINE void rfx_decoder_tile_free(void* obj)
{ {
RFX_TILE* tile = (RFX_TILE*)obj; RFX_TILE* tile = (RFX_TILE*)obj;
@@ -192,13 +193,13 @@ static void rfx_decoder_tile_free(void* obj)
} }
} }
static void* rfx_encoder_tile_new(const void* val) static INLINE void* rfx_encoder_tile_new(const void* val)
{ {
WINPR_UNUSED(val); WINPR_UNUSED(val);
return winpr_aligned_calloc(1, sizeof(RFX_TILE), 32); return winpr_aligned_calloc(1, sizeof(RFX_TILE), 32);
} }
static void rfx_encoder_tile_free(void* obj) static INLINE void rfx_encoder_tile_free(void* obj)
{ {
winpr_aligned_free(obj); winpr_aligned_free(obj);
} }
@@ -392,7 +393,7 @@ void rfx_context_free(RFX_CONTEXT* context)
winpr_aligned_free(context); winpr_aligned_free(context);
} }
static RFX_TILE* rfx_message_get_tile(RFX_MESSAGE* message, UINT32 index) static INLINE RFX_TILE* rfx_message_get_tile(RFX_MESSAGE* WINPR_RESTRICT message, UINT32 index)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
WINPR_ASSERT(message->tiles); WINPR_ASSERT(message->tiles);
@@ -400,7 +401,8 @@ static RFX_TILE* rfx_message_get_tile(RFX_MESSAGE* message, UINT32 index)
return message->tiles[index]; return message->tiles[index];
} }
static const RFX_RECT* rfx_message_get_rect_const(const RFX_MESSAGE* message, UINT32 index) static INLINE const RFX_RECT* rfx_message_get_rect_const(const RFX_MESSAGE* WINPR_RESTRICT message,
UINT32 index)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
WINPR_ASSERT(message->rects); WINPR_ASSERT(message->rects);
@@ -408,7 +410,7 @@ static const RFX_RECT* rfx_message_get_rect_const(const RFX_MESSAGE* message, UI
return &message->rects[index]; return &message->rects[index];
} }
static RFX_RECT* rfx_message_get_rect(RFX_MESSAGE* message, UINT32 index) static INLINE RFX_RECT* rfx_message_get_rect(RFX_MESSAGE* WINPR_RESTRICT message, UINT32 index)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
WINPR_ASSERT(message->rects); WINPR_ASSERT(message->rects);
@@ -416,32 +418,33 @@ static RFX_RECT* rfx_message_get_rect(RFX_MESSAGE* message, UINT32 index)
return &message->rects[index]; return &message->rects[index];
} }
void rfx_context_set_pixel_format(RFX_CONTEXT* context, UINT32 pixel_format) void rfx_context_set_pixel_format(RFX_CONTEXT* WINPR_RESTRICT context, UINT32 pixel_format)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
context->pixel_format = pixel_format; context->pixel_format = pixel_format;
context->bits_per_pixel = FreeRDPGetBitsPerPixel(pixel_format); context->bits_per_pixel = FreeRDPGetBitsPerPixel(pixel_format);
} }
UINT32 rfx_context_get_pixel_format(RFX_CONTEXT* context) UINT32 rfx_context_get_pixel_format(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
return context->pixel_format; return context->pixel_format;
} }
void rfx_context_set_palette(RFX_CONTEXT* context, const BYTE* palette) void rfx_context_set_palette(RFX_CONTEXT* WINPR_RESTRICT context,
const BYTE* WINPR_RESTRICT palette)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
context->palette = palette; context->palette = palette;
} }
const BYTE* rfx_context_get_palette(RFX_CONTEXT* context) const BYTE* rfx_context_get_palette(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
return context->palette; return context->palette;
} }
BOOL rfx_context_reset(RFX_CONTEXT* context, UINT32 width, UINT32 height) BOOL rfx_context_reset(RFX_CONTEXT* WINPR_RESTRICT context, UINT32 width, UINT32 height)
{ {
if (!context) if (!context)
return FALSE; return FALSE;
@@ -454,7 +457,8 @@ BOOL rfx_context_reset(RFX_CONTEXT* context, UINT32 width, UINT32 height)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_sync(RFX_CONTEXT* context, wStream* s) static INLINE BOOL rfx_process_message_sync(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
UINT32 magic = 0; UINT32 magic = 0;
@@ -486,7 +490,8 @@ static BOOL rfx_process_message_sync(RFX_CONTEXT* context, wStream* s)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_codec_versions(RFX_CONTEXT* context, wStream* s) static INLINE BOOL rfx_process_message_codec_versions(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
BYTE numCodecs = 0; BYTE numCodecs = 0;
@@ -529,7 +534,8 @@ static BOOL rfx_process_message_codec_versions(RFX_CONTEXT* context, wStream* s)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_channels(RFX_CONTEXT* context, wStream* s) static INLINE BOOL rfx_process_message_channels(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
BYTE channelId = 0; BYTE channelId = 0;
BYTE numChannels = 0; BYTE numChannels = 0;
@@ -585,7 +591,8 @@ static BOOL rfx_process_message_channels(RFX_CONTEXT* context, wStream* s)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_context(RFX_CONTEXT* context, wStream* s) static INLINE BOOL rfx_process_message_context(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
BYTE ctxId = 0; BYTE ctxId = 0;
UINT16 tileSize = 0; UINT16 tileSize = 0;
@@ -637,8 +644,10 @@ static BOOL rfx_process_message_context(RFX_CONTEXT* context, wStream* s)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_frame_begin(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, static INLINE BOOL rfx_process_message_frame_begin(RFX_CONTEXT* WINPR_RESTRICT context,
UINT16* pExpectedBlockType) RFX_MESSAGE* WINPR_RESTRICT message,
wStream* WINPR_RESTRICT s,
UINT16* WINPR_RESTRICT pExpectedBlockType)
{ {
UINT32 frameIdx = 0; UINT32 frameIdx = 0;
UINT16 numRegions = 0; UINT16 numRegions = 0;
@@ -668,8 +677,10 @@ static BOOL rfx_process_message_frame_begin(RFX_CONTEXT* context, RFX_MESSAGE* m
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_frame_end(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, static INLINE BOOL rfx_process_message_frame_end(RFX_CONTEXT* WINPR_RESTRICT context,
UINT16* pExpectedBlockType) RFX_MESSAGE* WINPR_RESTRICT message,
wStream* WINPR_RESTRICT s,
UINT16* WINPR_RESTRICT pExpectedBlockType)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(context->priv); WINPR_ASSERT(context->priv);
@@ -688,7 +699,7 @@ static BOOL rfx_process_message_frame_end(RFX_CONTEXT* context, RFX_MESSAGE* mes
return TRUE; return TRUE;
} }
static BOOL rfx_resize_rects(RFX_MESSAGE* message) static INLINE BOOL rfx_resize_rects(RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -700,8 +711,10 @@ static BOOL rfx_resize_rects(RFX_MESSAGE* message)
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_region(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s, static INLINE BOOL rfx_process_message_region(RFX_CONTEXT* WINPR_RESTRICT context,
UINT16* pExpectedBlockType) RFX_MESSAGE* WINPR_RESTRICT message,
wStream* WINPR_RESTRICT s,
UINT16* WINPR_RESTRICT pExpectedBlockType)
{ {
UINT16 regionType = 0; UINT16 regionType = 0;
UINT16 numTileSets = 0; UINT16 numTileSets = 0;
@@ -793,15 +806,16 @@ typedef struct
RFX_CONTEXT* context; RFX_CONTEXT* context;
} RFX_TILE_PROCESS_WORK_PARAM; } RFX_TILE_PROCESS_WORK_PARAM;
static void CALLBACK rfx_process_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance, static INLINE void CALLBACK rfx_process_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance,
void* context, PTP_WORK work) void* context, PTP_WORK work)
{ {
RFX_TILE_PROCESS_WORK_PARAM* param = (RFX_TILE_PROCESS_WORK_PARAM*)context; RFX_TILE_PROCESS_WORK_PARAM* param = (RFX_TILE_PROCESS_WORK_PARAM*)context;
WINPR_ASSERT(param); WINPR_ASSERT(param);
rfx_decode_rgb(param->context, param->tile, param->tile->data, 64 * 4); rfx_decode_rgb(param->context, param->tile, param->tile->data, 64 * 4);
} }
static BOOL rfx_allocate_tiles(RFX_MESSAGE* message, size_t count, BOOL allocOnly) static INLINE BOOL rfx_allocate_tiles(RFX_MESSAGE* WINPR_RESTRICT message, size_t count,
BOOL allocOnly)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -820,8 +834,11 @@ static BOOL rfx_allocate_tiles(RFX_MESSAGE* message, size_t count, BOOL allocOnl
return TRUE; return TRUE;
} }
static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* message, wStream* s,
UINT16* pExpectedBlockType) static INLINE BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT context,
RFX_MESSAGE* WINPR_RESTRICT message,
wStream* WINPR_RESTRICT s,
UINT16* WINPR_RESTRICT pExpectedBlockType)
{ {
BOOL rc = 0; BOOL rc = 0;
size_t close_cnt = 0; size_t close_cnt = 0;
@@ -1116,9 +1133,10 @@ static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, RFX_MESSAGE* messa
return rc; return rc;
} }
BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length, UINT32 left, BOOL rfx_process_message(RFX_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_RESTRICT data,
UINT32 top, BYTE* dst, UINT32 dstFormat, UINT32 dstStride, UINT32 length, UINT32 left, UINT32 top, BYTE* WINPR_RESTRICT dst,
UINT32 dstHeight, REGION16* invalidRegion) UINT32 dstFormat, UINT32 dstStride, UINT32 dstHeight,
REGION16* WINPR_RESTRICT invalidRegion)
{ {
REGION16 updateRegion = { 0 }; REGION16 updateRegion = { 0 };
wStream inStream = { 0 }; wStream inStream = { 0 };
@@ -1358,7 +1376,8 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
return FALSE; return FALSE;
} }
const UINT32* rfx_message_get_quants(const RFX_MESSAGE* message, UINT16* numQuantVals) const UINT32* rfx_message_get_quants(const RFX_MESSAGE* WINPR_RESTRICT message,
UINT16* WINPR_RESTRICT numQuantVals)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
if (numQuantVals) if (numQuantVals)
@@ -1366,7 +1385,8 @@ const UINT32* rfx_message_get_quants(const RFX_MESSAGE* message, UINT16* numQuan
return message->quantVals; return message->quantVals;
} }
const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTiles) const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* WINPR_RESTRICT message,
UINT16* WINPR_RESTRICT numTiles)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
if (numTiles) if (numTiles)
@@ -1374,13 +1394,14 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi
return (const RFX_TILE**)message->tiles; return (const RFX_TILE**)message->tiles;
} }
UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message) UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
return message->numTiles; return message->numTiles;
} }
const RFX_RECT* rfx_message_get_rects(const RFX_MESSAGE* message, UINT16* numRects) const RFX_RECT* rfx_message_get_rects(const RFX_MESSAGE* WINPR_RESTRICT message,
UINT16* WINPR_RESTRICT numRects)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
if (numRects) if (numRects)
@@ -1388,13 +1409,13 @@ const RFX_RECT* rfx_message_get_rects(const RFX_MESSAGE* message, UINT16* numRec
return message->rects; return message->rects;
} }
UINT16 rfx_message_get_rect_count(const RFX_MESSAGE* message) UINT16 rfx_message_get_rect_count(const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
return message->numRects; return message->numRects;
} }
void rfx_message_free(RFX_CONTEXT* context, RFX_MESSAGE* message) void rfx_message_free(RFX_CONTEXT* WINPR_RESTRICT context, RFX_MESSAGE* WINPR_RESTRICT message)
{ {
if (!message) if (!message)
return; return;
@@ -1429,7 +1450,7 @@ void rfx_message_free(RFX_CONTEXT* context, RFX_MESSAGE* message)
winpr_aligned_free(message); winpr_aligned_free(message);
} }
static void rfx_update_context_properties(RFX_CONTEXT* context) static INLINE void rfx_update_context_properties(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
UINT16 properties = 0; UINT16 properties = 0;
@@ -1444,7 +1465,8 @@ static void rfx_update_context_properties(RFX_CONTEXT* context)
context->properties = properties; context->properties = properties;
} }
static void rfx_write_message_sync(const RFX_CONTEXT* context, wStream* s) static INLINE void rfx_write_message_sync(const RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
@@ -1454,7 +1476,8 @@ static void rfx_write_message_sync(const RFX_CONTEXT* context, wStream* s)
Stream_Write_UINT16(s, WF_VERSION_1_0); /* version (2 bytes) */ Stream_Write_UINT16(s, WF_VERSION_1_0); /* version (2 bytes) */
} }
static void rfx_write_message_codec_versions(const RFX_CONTEXT* context, wStream* s) static INLINE void rfx_write_message_codec_versions(const RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
@@ -1465,7 +1488,8 @@ static void rfx_write_message_codec_versions(const RFX_CONTEXT* context, wStream
Stream_Write_UINT16(s, WF_VERSION_1_0); /* codecs.version (2 bytes) */ Stream_Write_UINT16(s, WF_VERSION_1_0); /* codecs.version (2 bytes) */
} }
static void rfx_write_message_channels(const RFX_CONTEXT* context, wStream* s) static INLINE void rfx_write_message_channels(const RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
@@ -1477,7 +1501,8 @@ static void rfx_write_message_channels(const RFX_CONTEXT* context, wStream* s)
Stream_Write_UINT16(s, context->height); /* Channel.height (2 bytes) */ Stream_Write_UINT16(s, context->height); /* Channel.height (2 bytes) */
} }
static void rfx_write_message_context(RFX_CONTEXT* context, wStream* s) static INLINE void rfx_write_message_context(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
UINT16 properties = 0; UINT16 properties = 0;
WINPR_ASSERT(context); WINPR_ASSERT(context);
@@ -1498,7 +1523,8 @@ static void rfx_write_message_context(RFX_CONTEXT* context, wStream* s)
rfx_update_context_properties(context); rfx_update_context_properties(context);
} }
static BOOL rfx_compose_message_header(RFX_CONTEXT* context, wStream* s) static INLINE BOOL rfx_compose_message_header(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
if (!Stream_EnsureRemainingCapacity(s, 12 + 10 + 12 + 13)) if (!Stream_EnsureRemainingCapacity(s, 12 + 10 + 12 + 13))
@@ -1511,13 +1537,13 @@ static BOOL rfx_compose_message_header(RFX_CONTEXT* context, wStream* s)
return TRUE; return TRUE;
} }
static size_t rfx_tile_length(const RFX_TILE* tile) static INLINE size_t rfx_tile_length(const RFX_TILE* WINPR_RESTRICT tile)
{ {
WINPR_ASSERT(tile); WINPR_ASSERT(tile);
return 19ull + tile->YLen + tile->CbLen + tile->CrLen; return 19ull + tile->YLen + tile->CbLen + tile->CrLen;
} }
static BOOL rfx_write_tile(wStream* s, const RFX_TILE* tile) static INLINE BOOL rfx_write_tile(wStream* WINPR_RESTRICT s, const RFX_TILE* WINPR_RESTRICT tile)
{ {
const size_t blockLen = rfx_tile_length(tile); const size_t blockLen = rfx_tile_length(tile);
@@ -1546,16 +1572,16 @@ struct S_RFX_TILE_COMPOSE_WORK_PARAM
RFX_CONTEXT* context; RFX_CONTEXT* context;
}; };
static void CALLBACK rfx_compose_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance, static INLINE void CALLBACK rfx_compose_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance,
void* context, PTP_WORK work) void* context, PTP_WORK work)
{ {
RFX_TILE_COMPOSE_WORK_PARAM* param = (RFX_TILE_COMPOSE_WORK_PARAM*)context; RFX_TILE_COMPOSE_WORK_PARAM* param = (RFX_TILE_COMPOSE_WORK_PARAM*)context;
WINPR_ASSERT(param); WINPR_ASSERT(param);
rfx_encode_rgb(param->context, param->tile); rfx_encode_rgb(param->context, param->tile);
} }
static BOOL computeRegion(const RFX_RECT* rects, size_t numRects, REGION16* region, size_t width, static INLINE BOOL computeRegion(const RFX_RECT* WINPR_RESTRICT rects, size_t numRects,
size_t height) REGION16* WINPR_RESTRICT region, size_t width, size_t height)
{ {
const RECTANGLE_16 mainRect = { 0, 0, width, height }; const RECTANGLE_16 mainRect = { 0, 0, width, height };
@@ -1578,7 +1604,7 @@ static BOOL computeRegion(const RFX_RECT* rects, size_t numRects, REGION16* regi
#define TILE_NO(v) ((v) / 64) #define TILE_NO(v) ((v) / 64)
static BOOL setupWorkers(RFX_CONTEXT* context, size_t nbTiles) static INLINE BOOL setupWorkers(RFX_CONTEXT* WINPR_RESTRICT context, size_t nbTiles)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
@@ -1603,7 +1629,7 @@ static BOOL setupWorkers(RFX_CONTEXT* context, size_t nbTiles)
return TRUE; return TRUE;
} }
static BOOL rfx_ensure_tiles(RFX_MESSAGE* message, size_t count) static INLINE BOOL rfx_ensure_tiles(RFX_MESSAGE* WINPR_RESTRICT message, size_t count)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -1614,8 +1640,9 @@ static BOOL rfx_ensure_tiles(RFX_MESSAGE* message, size_t count)
return rfx_allocate_tiles(message, alloc, TRUE); return rfx_allocate_tiles(message, alloc, TRUE);
} }
RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* context, const RFX_RECT* rects, size_t numRects, RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context,
const BYTE* data, UINT32 w, UINT32 h, size_t s) const RFX_RECT* WINPR_RESTRICT rects, size_t numRects,
const BYTE* WINPR_RESTRICT data, UINT32 w, UINT32 h, size_t s)
{ {
const UINT32 width = (UINT32)w; const UINT32 width = (UINT32)w;
const UINT32 height = (UINT32)h; const UINT32 height = (UINT32)h;
@@ -1843,7 +1870,8 @@ skip_encoding_loop:
return NULL; return NULL;
} }
static BOOL rfx_clone_rects(RFX_MESSAGE* dst, const RFX_MESSAGE* src) static INLINE BOOL rfx_clone_rects(RFX_MESSAGE* WINPR_RESTRICT dst,
const RFX_MESSAGE* WINPR_RESTRICT src)
{ {
WINPR_ASSERT(dst); WINPR_ASSERT(dst);
WINPR_ASSERT(src); WINPR_ASSERT(src);
@@ -1865,7 +1893,8 @@ static BOOL rfx_clone_rects(RFX_MESSAGE* dst, const RFX_MESSAGE* src)
return TRUE; return TRUE;
} }
static BOOL rfx_clone_quants(RFX_MESSAGE* dst, const RFX_MESSAGE* src) static INLINE BOOL rfx_clone_quants(RFX_MESSAGE* WINPR_RESTRICT dst,
const RFX_MESSAGE* WINPR_RESTRICT src)
{ {
WINPR_ASSERT(dst); WINPR_ASSERT(dst);
WINPR_ASSERT(src); WINPR_ASSERT(src);
@@ -1883,8 +1912,9 @@ static BOOL rfx_clone_quants(RFX_MESSAGE* dst, const RFX_MESSAGE* src)
return TRUE; return TRUE;
} }
static RFX_MESSAGE* rfx_split_message(RFX_CONTEXT* context, RFX_MESSAGE* message, static INLINE RFX_MESSAGE* rfx_split_message(RFX_CONTEXT* WINPR_RESTRICT context,
size_t* numMessages, size_t maxDataSize) RFX_MESSAGE* WINPR_RESTRICT message,
size_t* WINPR_RESTRICT numMessages, size_t maxDataSize)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -1944,7 +1974,7 @@ free_messages:
return NULL; return NULL;
} }
const RFX_MESSAGE* rfx_message_list_get(const RFX_MESSAGE_LIST* messages, size_t idx) const RFX_MESSAGE* rfx_message_list_get(const RFX_MESSAGE_LIST* WINPR_RESTRICT messages, size_t idx)
{ {
WINPR_ASSERT(messages); WINPR_ASSERT(messages);
if (idx >= messages->count) if (idx >= messages->count)
@@ -1962,8 +1992,9 @@ void rfx_message_list_free(RFX_MESSAGE_LIST* messages)
free(messages); free(messages);
} }
static RFX_MESSAGE_LIST* rfx_message_list_new(RFX_CONTEXT* context, RFX_MESSAGE* messages, static INLINE RFX_MESSAGE_LIST* rfx_message_list_new(RFX_CONTEXT* WINPR_RESTRICT context,
size_t count) RFX_MESSAGE* WINPR_RESTRICT messages,
size_t count)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
RFX_MESSAGE_LIST* msg = calloc(1, sizeof(RFX_MESSAGE_LIST)); RFX_MESSAGE_LIST* msg = calloc(1, sizeof(RFX_MESSAGE_LIST));
@@ -1975,9 +2006,11 @@ static RFX_MESSAGE_LIST* rfx_message_list_new(RFX_CONTEXT* context, RFX_MESSAGE*
return msg; return msg;
} }
RFX_MESSAGE_LIST* rfx_encode_messages(RFX_CONTEXT* context, const RFX_RECT* rects, size_t numRects, RFX_MESSAGE_LIST* rfx_encode_messages(RFX_CONTEXT* WINPR_RESTRICT context,
const BYTE* data, UINT32 width, UINT32 height, const RFX_RECT* WINPR_RESTRICT rects, size_t numRects,
UINT32 scanline, size_t* numMessages, size_t maxDataSize) const BYTE* WINPR_RESTRICT data, UINT32 width, UINT32 height,
UINT32 scanline, size_t* WINPR_RESTRICT numMessages,
size_t maxDataSize)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(numMessages); WINPR_ASSERT(numMessages);
@@ -1995,7 +2028,9 @@ RFX_MESSAGE_LIST* rfx_encode_messages(RFX_CONTEXT* context, const RFX_RECT* rect
return rfx_message_list_new(context, list, *numMessages); return rfx_message_list_new(context, list, *numMessages);
} }
static BOOL rfx_write_message_tileset(RFX_CONTEXT* context, wStream* s, const RFX_MESSAGE* message) static INLINE BOOL rfx_write_message_tileset(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -2043,8 +2078,9 @@ static BOOL rfx_write_message_tileset(RFX_CONTEXT* context, wStream* s, const RF
return TRUE; return TRUE;
} }
static BOOL rfx_write_message_frame_begin(RFX_CONTEXT* context, wStream* s, static INLINE BOOL rfx_write_message_frame_begin(RFX_CONTEXT* WINPR_RESTRICT context,
const RFX_MESSAGE* message) wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -2061,7 +2097,9 @@ static BOOL rfx_write_message_frame_begin(RFX_CONTEXT* context, wStream* s,
return TRUE; return TRUE;
} }
static BOOL rfx_write_message_region(RFX_CONTEXT* context, wStream* s, const RFX_MESSAGE* message) static INLINE BOOL rfx_write_message_region(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -2095,8 +2133,9 @@ static BOOL rfx_write_message_region(RFX_CONTEXT* context, wStream* s, const RFX
return TRUE; return TRUE;
} }
static BOOL rfx_write_message_frame_end(RFX_CONTEXT* context, wStream* s, static INLINE BOOL rfx_write_message_frame_end(RFX_CONTEXT* WINPR_RESTRICT context,
const RFX_MESSAGE* message) wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -2111,7 +2150,8 @@ static BOOL rfx_write_message_frame_end(RFX_CONTEXT* context, wStream* s,
return TRUE; return TRUE;
} }
BOOL rfx_write_message(RFX_CONTEXT* context, wStream* s, const RFX_MESSAGE* message) BOOL rfx_write_message(RFX_CONTEXT* WINPR_RESTRICT context, wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
WINPR_ASSERT(message); WINPR_ASSERT(message);
@@ -2135,8 +2175,10 @@ BOOL rfx_write_message(RFX_CONTEXT* context, wStream* s, const RFX_MESSAGE* mess
return TRUE; return TRUE;
} }
BOOL rfx_compose_message(RFX_CONTEXT* context, wStream* s, const RFX_RECT* rects, size_t numRects, BOOL rfx_compose_message(RFX_CONTEXT* WINPR_RESTRICT context, wStream* WINPR_RESTRICT s,
const BYTE* data, UINT32 width, UINT32 height, UINT32 scanline) const RFX_RECT* WINPR_RESTRICT rects, size_t numRects,
const BYTE* WINPR_RESTRICT data, UINT32 width, UINT32 height,
UINT32 scanline)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
RFX_MESSAGE* message = RFX_MESSAGE* message =
@@ -2149,32 +2191,33 @@ BOOL rfx_compose_message(RFX_CONTEXT* context, wStream* s, const RFX_RECT* rects
return ret; return ret;
} }
BOOL rfx_context_set_mode(RFX_CONTEXT* context, RLGR_MODE mode) BOOL rfx_context_set_mode(RFX_CONTEXT* WINPR_RESTRICT context, RLGR_MODE mode)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
context->mode = mode; context->mode = mode;
return TRUE; return TRUE;
} }
RLGR_MODE rfx_context_get_mode(RFX_CONTEXT* context) RLGR_MODE rfx_context_get_mode(RFX_CONTEXT* WINPR_RESTRICT context)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
return context->mode; return context->mode;
} }
UINT32 rfx_context_get_frame_idx(const RFX_CONTEXT* context) UINT32 rfx_context_get_frame_idx(const RFX_CONTEXT* WINPR_RESTRICT context)
{ {
WINPR_ASSERT(context); WINPR_ASSERT(context);
return context->frameIdx; return context->frameIdx;
} }
UINT32 rfx_message_get_frame_idx(const RFX_MESSAGE* message) UINT32 rfx_message_get_frame_idx(const RFX_MESSAGE* WINPR_RESTRICT message)
{ {
WINPR_ASSERT(message); WINPR_ASSERT(message);
return message->frameIdx; return message->frameIdx;
} }
static INLINE BOOL rfx_write_progressive_wb_sync(RFX_CONTEXT* rfx, wStream* s) static INLINE BOOL rfx_write_progressive_wb_sync(RFX_CONTEXT* WINPR_RESTRICT rfx,
wStream* WINPR_RESTRICT s)
{ {
const UINT32 blockLen = 12; const UINT32 blockLen = 12;
WINPR_ASSERT(rfx); WINPR_ASSERT(rfx);
@@ -2190,7 +2233,8 @@ static INLINE BOOL rfx_write_progressive_wb_sync(RFX_CONTEXT* rfx, wStream* s)
return TRUE; return TRUE;
} }
static INLINE BOOL rfx_write_progressive_wb_context(RFX_CONTEXT* rfx, wStream* s) static INLINE BOOL rfx_write_progressive_wb_context(RFX_CONTEXT* WINPR_RESTRICT rfx,
wStream* WINPR_RESTRICT s)
{ {
const UINT32 blockLen = 10; const UINT32 blockLen = 10;
WINPR_ASSERT(rfx); WINPR_ASSERT(rfx);
@@ -2207,8 +2251,9 @@ static INLINE BOOL rfx_write_progressive_wb_context(RFX_CONTEXT* rfx, wStream* s
return TRUE; return TRUE;
} }
static INLINE BOOL rfx_write_progressive_region(RFX_CONTEXT* rfx, wStream* s, static INLINE BOOL rfx_write_progressive_region(RFX_CONTEXT* WINPR_RESTRICT rfx,
const RFX_MESSAGE* msg) wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT msg)
{ {
/* RFX_REGION */ /* RFX_REGION */
UINT32 blockLen = 18; UINT32 blockLen = 18;
@@ -2285,8 +2330,9 @@ static INLINE BOOL rfx_write_progressive_region(RFX_CONTEXT* rfx, wStream* s,
return (used == blockLen); return (used == blockLen);
} }
static INLINE BOOL rfx_write_progressive_frame_begin(RFX_CONTEXT* rfx, wStream* s, static INLINE BOOL rfx_write_progressive_frame_begin(RFX_CONTEXT* WINPR_RESTRICT rfx,
const RFX_MESSAGE* msg) wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT msg)
{ {
const UINT32 blockLen = 12; const UINT32 blockLen = 12;
WINPR_ASSERT(rfx); WINPR_ASSERT(rfx);
@@ -2304,7 +2350,8 @@ static INLINE BOOL rfx_write_progressive_frame_begin(RFX_CONTEXT* rfx, wStream*
return TRUE; return TRUE;
} }
static INLINE BOOL rfx_write_progressive_frame_end(RFX_CONTEXT* rfx, wStream* s) static INLINE BOOL rfx_write_progressive_frame_end(RFX_CONTEXT* WINPR_RESTRICT rfx,
wStream* WINPR_RESTRICT s)
{ {
const UINT32 blockLen = 6; const UINT32 blockLen = 6;
WINPR_ASSERT(rfx); WINPR_ASSERT(rfx);
@@ -2319,8 +2366,9 @@ static INLINE BOOL rfx_write_progressive_frame_end(RFX_CONTEXT* rfx, wStream* s)
return TRUE; return TRUE;
} }
static INLINE BOOL rfx_write_progressive_tile_simple(RFX_CONTEXT* rfx, wStream* s, static INLINE BOOL rfx_write_progressive_tile_simple(RFX_CONTEXT* WINPR_RESTRICT rfx,
const RFX_TILE* tile) wStream* WINPR_RESTRICT s,
const RFX_TILE* WINPR_RESTRICT tile)
{ {
UINT32 blockLen = 0; UINT32 blockLen = 0;
WINPR_ASSERT(rfx); WINPR_ASSERT(rfx);
@@ -2383,7 +2431,9 @@ const char* rfx_get_progressive_block_type_string(UINT16 blockType)
} }
} }
BOOL rfx_write_message_progressive_simple(RFX_CONTEXT* context, wStream* s, const RFX_MESSAGE* msg) BOOL rfx_write_message_progressive_simple(RFX_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s,
const RFX_MESSAGE* WINPR_RESTRICT msg)
{ {
WINPR_ASSERT(s); WINPR_ASSERT(s);
WINPR_ASSERT(msg); WINPR_ASSERT(msg);

11
libfreerdp/codec/rfx_decode.c
View File

@@ -35,10 +35,10 @@
#include "rfx_decode.h" #include "rfx_decode.h"
void rfx_decode_component(RFX_CONTEXT* WINPR_RESTRICT context, static INLINE void rfx_decode_component(RFX_CONTEXT* WINPR_RESTRICT context,
const UINT32* WINPR_RESTRICT quantization_values, const UINT32* WINPR_RESTRICT quantization_values,
const BYTE* WINPR_RESTRICT data, size_t size, const BYTE* WINPR_RESTRICT data, size_t size,
INT16* WINPR_RESTRICT buffer) INT16* WINPR_RESTRICT buffer)
{ {
INT16* dwt_buffer = NULL; INT16* dwt_buffer = NULL;
dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */ dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */
@@ -62,7 +62,8 @@ void rfx_decode_component(RFX_CONTEXT* WINPR_RESTRICT context,
/* rfx_decode_ycbcr_to_rgb code now resides in the primitives library. */ /* rfx_decode_ycbcr_to_rgb code now resides in the primitives library. */
/* stride is bytes between rows in the output buffer. */ /* stride is bytes between rows in the output buffer. */
BOOL rfx_decode_rgb(RFX_CONTEXT* context, const RFX_TILE* tile, BYTE* rgb_buffer, UINT32 stride) BOOL rfx_decode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, const RFX_TILE* WINPR_RESTRICT tile,
BYTE* WINPR_RESTRICT rgb_buffer, UINT32 stride)
{ {
union union
{ {

5
libfreerdp/codec/rfx_decode.h
View File

@@ -29,8 +29,5 @@
FREERDP_LOCAL BOOL rfx_decode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, FREERDP_LOCAL BOOL rfx_decode_rgb(RFX_CONTEXT* WINPR_RESTRICT context,
const RFX_TILE* WINPR_RESTRICT tile, const RFX_TILE* WINPR_RESTRICT tile,
BYTE* WINPR_RESTRICT rgb_buffer, UINT32 stride); BYTE* WINPR_RESTRICT rgb_buffer, UINT32 stride);
FREERDP_LOCAL void rfx_decode_component(RFX_CONTEXT* WINPR_RESTRICT context,
const UINT32* WINPR_RESTRICT quantization_values,
const BYTE* WINPR_RESTRICT data, size_t size,
INT16* WINPR_RESTRICT buffer);
#endif /* FREERDP_LIB_CODEC_RFX_DECODE_H */ #endif /* FREERDP_LIB_CODEC_RFX_DECODE_H */

4
libfreerdp/codec/rfx_differential.h
View File

@@ -23,7 +23,7 @@
#include <freerdp/codec/rfx.h> #include <freerdp/codec/rfx.h>
#include <freerdp/api.h> #include <freerdp/api.h>
static INLINE void rfx_differential_decode(INT16* buffer, int size) static INLINE void rfx_differential_decode(INT16* WINPR_RESTRICT buffer, size_t size)
{ {
INT16* ptr = buffer; INT16* ptr = buffer;
INT16* end = &buffer[size - 1]; INT16* end = &buffer[size - 1];
@@ -35,7 +35,7 @@ static INLINE void rfx_differential_decode(INT16* buffer, int size)
} }
} }
static INLINE void rfx_differential_encode(INT16* buffer, int size) static INLINE void rfx_differential_encode(INT16* WINPR_RESTRICT buffer, size_t size)
{ {
INT16 n1 = buffer[0]; INT16 n1 = buffer[0];
for (int x = 0; x < size - 1; x++) for (int x = 0; x < size - 1; x++)

10
libfreerdp/codec/rfx_dwt.c
View File

@@ -25,7 +25,8 @@
#include "rfx_dwt.h" #include "rfx_dwt.h"
static void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, size_t subband_width) static INLINE void rfx_dwt_2d_decode_block(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT idwt,
size_t subband_width)
{ {
INT16* dst = NULL; INT16* dst = NULL;
INT16* l = NULL; INT16* l = NULL;
@@ -114,7 +115,7 @@ static void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, size_t subband_w
} }
} }
void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer) void rfx_dwt_2d_decode(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(dwt_buffer); WINPR_ASSERT(dwt_buffer);
@@ -124,7 +125,8 @@ void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer)
rfx_dwt_2d_decode_block(&buffer[0], dwt_buffer, 32); rfx_dwt_2d_decode_block(&buffer[0], dwt_buffer, 32);
} }
static void rfx_dwt_2d_encode_block(INT16* buffer, INT16* dwt, UINT32 subband_width) static void rfx_dwt_2d_encode_block(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt,
UINT32 subband_width)
{ {
INT16* src = NULL; INT16* src = NULL;
INT16* l = NULL; INT16* l = NULL;
@@ -207,7 +209,7 @@ static void rfx_dwt_2d_encode_block(INT16* buffer, INT16* dwt, UINT32 subband_wi
} }
} }
void rfx_dwt_2d_encode(INT16* buffer, INT16* dwt_buffer) void rfx_dwt_2d_encode(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(dwt_buffer); WINPR_ASSERT(dwt_buffer);

9
libfreerdp/codec/rfx_dwt.h
View File

@@ -24,8 +24,11 @@
#include <freerdp/codec/rfx.h> #include <freerdp/codec/rfx.h>
#include <freerdp/api.h> #include <freerdp/api.h>
FREERDP_LOCAL void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer); FREERDP_LOCAL void rfx_dwt_2d_decode(INT16* WINPR_RESTRICT buffer,
FREERDP_LOCAL void rfx_dwt_2d_encode(INT16* buffer, INT16* dwt_buffer); INT16* WINPR_RESTRICT dwt_buffer);
FREERDP_LOCAL void rfx_dwt_2d_extrapolate_decode(INT16* buffer, INT16* dwt_buffer); FREERDP_LOCAL void rfx_dwt_2d_encode(INT16* WINPR_RESTRICT buffer,
INT16* WINPR_RESTRICT dwt_buffer);
FREERDP_LOCAL void rfx_dwt_2d_extrapolate_decode(INT16* WINPR_RESTRICT buffer,
INT16* WINPR_RESTRICT dwt_buffer);
#endif /* FREERDP_LIB_CODEC_RFX_DWT_H */ #endif /* FREERDP_LIB_CODEC_RFX_DWT_H */

15
libfreerdp/codec/rfx_encode.c
View File

@@ -39,9 +39,10 @@
#define MINMAX(_v, _l, _h) ((_v) < (_l) ? (_l) : ((_v) > (_h) ? (_h) : (_v))) #define MINMAX(_v, _l, _h) ((_v) < (_l) ? (_l) : ((_v) > (_h) ? (_h) : (_v)))
static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, int rowstride, static void rfx_encode_format_rgb(const BYTE* WINPR_RESTRICT rgb_data, int width, int height,
UINT32 pixel_format, const BYTE* palette, INT16* r_buf, int rowstride, UINT32 pixel_format,
INT16* g_buf, INT16* b_buf) const BYTE* WINPR_RESTRICT palette, INT16* WINPR_RESTRICT r_buf,
INT16* WINPR_RESTRICT g_buf, INT16* WINPR_RESTRICT b_buf)
{ {
int x_exceed = 0; int x_exceed = 0;
int y_exceed = 0; int y_exceed = 0;
@@ -233,8 +234,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i
/* rfx_encode_rgb_to_ycbcr code now resides in the primitives library. */ /* rfx_encode_rgb_to_ycbcr code now resides in the primitives library. */
static void rfx_encode_component(RFX_CONTEXT* context, const UINT32* quantization_values, static void rfx_encode_component(RFX_CONTEXT* WINPR_RESTRICT context,
INT16* data, BYTE* buffer, int buffer_size, int* size) const UINT32* WINPR_RESTRICT quantization_values,
INT16* WINPR_RESTRICT data, BYTE* WINPR_RESTRICT buffer,
int buffer_size, int* WINPR_RESTRICT size)
{ {
INT16* dwt_buffer = NULL; INT16* dwt_buffer = NULL;
dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */ dwt_buffer = BufferPool_Take(context->priv->BufferPool, -1); /* dwt_buffer */
@@ -255,7 +258,7 @@ static void rfx_encode_component(RFX_CONTEXT* context, const UINT32* quantizatio
BufferPool_Return(context->priv->BufferPool, dwt_buffer); BufferPool_Return(context->priv->BufferPool, dwt_buffer);
} }
void rfx_encode_rgb(RFX_CONTEXT* context, RFX_TILE* tile) void rfx_encode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, RFX_TILE* WINPR_RESTRICT tile)
{ {
union union
{ {

3
libfreerdp/codec/rfx_encode.h
View File

@@ -23,6 +23,7 @@
#include <freerdp/codec/rfx.h> #include <freerdp/codec/rfx.h>
#include <freerdp/api.h> #include <freerdp/api.h>
FREERDP_LOCAL void rfx_encode_rgb(RFX_CONTEXT* context, RFX_TILE* tile); FREERDP_LOCAL void rfx_encode_rgb(RFX_CONTEXT* WINPR_RESTRICT context,
RFX_TILE* WINPR_RESTRICT tile);
#endif /* FREERDP_LIB_CODEC_RFX_ENCODE_H */ #endif /* FREERDP_LIB_CODEC_RFX_ENCODE_H */

13
libfreerdp/codec/rfx_quantization.c
View File

@@ -41,8 +41,9 @@
* LL3 4032 8x8 64 * LL3 4032 8x8 64
*/ */
static void rfx_quantization_decode_block(const primitives_t* WINPR_RESTRICT prims, INT16* buffer, static INLINE void rfx_quantization_decode_block(const primitives_t* WINPR_RESTRICT prims,
UINT32 buffer_size, UINT32 factor) INT16* WINPR_RESTRICT buffer, UINT32 buffer_size,
UINT32 factor)
{ {
if (factor == 0) if (factor == 0)
return; return;
@@ -50,7 +51,7 @@ static void rfx_quantization_decode_block(const primitives_t* WINPR_RESTRICT pri
prims->lShiftC_16s(buffer, factor, buffer, buffer_size); prims->lShiftC_16s(buffer, factor, buffer, buffer_size);
} }
void rfx_quantization_decode(INT16* buffer, const UINT32* WINPR_RESTRICT quantVals) void rfx_quantization_decode(INT16* WINPR_RESTRICT buffer, const UINT32* WINPR_RESTRICT quantVals)
{ {
const primitives_t* prims = primitives_get(); const primitives_t* prims = primitives_get();
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
@@ -68,7 +69,8 @@ void rfx_quantization_decode(INT16* buffer, const UINT32* WINPR_RESTRICT quantVa
rfx_quantization_decode_block(prims, &buffer[4032], 64, quantVals[0] - 1); /* LL3 */ rfx_quantization_decode_block(prims, &buffer[4032], 64, quantVals[0] - 1); /* LL3 */
} }
static void rfx_quantization_encode_block(INT16* buffer, size_t buffer_size, UINT32 factor) static INLINE void rfx_quantization_encode_block(INT16* WINPR_RESTRICT buffer, size_t buffer_size,
UINT32 factor)
{ {
INT16 half = 0; INT16 half = 0;
@@ -83,7 +85,8 @@ static void rfx_quantization_encode_block(INT16* buffer, size_t buffer_size, UIN
} }
} }
void rfx_quantization_encode(INT16* buffer, const UINT32* WINPR_RESTRICT quantization_values) void rfx_quantization_encode(INT16* WINPR_RESTRICT buffer,
const UINT32* WINPR_RESTRICT quantization_values)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(quantization_values); WINPR_ASSERT(quantization_values);

6
libfreerdp/codec/rfx_quantization.h
View File

@@ -23,7 +23,9 @@
#include <freerdp/codec/rfx.h> #include <freerdp/codec/rfx.h>
#include <freerdp/api.h> #include <freerdp/api.h>
FREERDP_LOCAL void rfx_quantization_decode(INT16* buffer, const UINT32* quantization_values); FREERDP_LOCAL void rfx_quantization_decode(INT16* WINPR_RESTRICT buffer,
FREERDP_LOCAL void rfx_quantization_encode(INT16* buffer, const UINT32* quantization_values); const UINT32* WINPR_RESTRICT quantization_values);
FREERDP_LOCAL void rfx_quantization_encode(INT16* WINPR_RESTRICT buffer,
const UINT32* WINPR_RESTRICT quantization_values);
#endif /* FREERDP_LIB_CODEC_RFX_QUANTIZATION_H */ #endif /* FREERDP_LIB_CODEC_RFX_QUANTIZATION_H */

36
libfreerdp/codec/rfx_sse2.c
View File

@@ -49,7 +49,8 @@
_val = _mm_min_epi16(_max, _mm_max_epi16(_val, _min)); \ _val = _mm_min_epi16(_max, _mm_max_epi16(_val, _min)); \
} while (0) } while (0)
static __inline void __attribute__((ATTRIBUTES)) _mm_prefetch_buffer(char* buffer, int num_bytes) static __inline void __attribute__((ATTRIBUTES))
_mm_prefetch_buffer(char* WINPR_RESTRICT buffer, int num_bytes)
{ {
__m128i* buf = (__m128i*)buffer; __m128i* buf = (__m128i*)buffer;
@@ -64,7 +65,8 @@ static __inline void __attribute__((ATTRIBUTES)) _mm_prefetch_buffer(char* buffe
/* rfx_encode_rgb_to_ycbcr_sse2 code now resides in the primitives library. */ /* rfx_encode_rgb_to_ycbcr_sse2 code now resides in the primitives library. */
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_quantization_decode_block_sse2(INT16* buffer, const size_t buffer_size, const UINT32 factor) rfx_quantization_decode_block_sse2(INT16* WINPR_RESTRICT buffer, const size_t buffer_size,
const UINT32 factor)
{ {
__m128i a; __m128i a;
__m128i* ptr = (__m128i*)buffer; __m128i* ptr = (__m128i*)buffer;
@@ -82,7 +84,8 @@ rfx_quantization_decode_block_sse2(INT16* buffer, const size_t buffer_size, cons
} while (ptr < buf_end); } while (ptr < buf_end);
} }
static void rfx_quantization_decode_sse2(INT16* buffer, const UINT32* WINPR_RESTRICT quantVals) static void rfx_quantization_decode_sse2(INT16* WINPR_RESTRICT buffer,
const UINT32* WINPR_RESTRICT quantVals)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(quantVals); WINPR_ASSERT(quantVals);
@@ -101,7 +104,8 @@ static void rfx_quantization_decode_sse2(INT16* buffer, const UINT32* WINPR_REST
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_quantization_encode_block_sse2(INT16* buffer, const int buffer_size, const UINT32 factor) rfx_quantization_encode_block_sse2(INT16* WINPR_RESTRICT buffer, const int buffer_size,
const UINT32 factor)
{ {
__m128i a; __m128i a;
__m128i* ptr = (__m128i*)buffer; __m128i* ptr = (__m128i*)buffer;
@@ -123,7 +127,7 @@ rfx_quantization_encode_block_sse2(INT16* buffer, const int buffer_size, const U
} while (ptr < buf_end); } while (ptr < buf_end);
} }
static void rfx_quantization_encode_sse2(INT16* buffer, static void rfx_quantization_encode_sse2(INT16* WINPR_RESTRICT buffer,
const UINT32* WINPR_RESTRICT quantization_values) const UINT32* WINPR_RESTRICT quantization_values)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
@@ -144,7 +148,8 @@ static void rfx_quantization_encode_sse2(INT16* buffer,
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_decode_block_horiz_sse2(INT16* l, INT16* h, INT16* dst, int subband_width) rfx_dwt_2d_decode_block_horiz_sse2(INT16* WINPR_RESTRICT l, INT16* WINPR_RESTRICT h,
INT16* WINPR_RESTRICT dst, int subband_width)
{ {
INT16* l_ptr = l; INT16* l_ptr = l;
INT16* h_ptr = h; INT16* h_ptr = h;
@@ -218,7 +223,8 @@ rfx_dwt_2d_decode_block_horiz_sse2(INT16* l, INT16* h, INT16* dst, int subband_w
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_decode_block_vert_sse2(INT16* l, INT16* h, INT16* dst, int subband_width) rfx_dwt_2d_decode_block_vert_sse2(INT16* WINPR_RESTRICT l, INT16* WINPR_RESTRICT h,
INT16* WINPR_RESTRICT dst, int subband_width)
{ {
INT16* l_ptr = l; INT16* l_ptr = l;
INT16* h_ptr = h; INT16* h_ptr = h;
@@ -295,7 +301,8 @@ rfx_dwt_2d_decode_block_vert_sse2(INT16* l, INT16* h, INT16* dst, int subband_wi
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_decode_block_sse2(INT16* buffer, INT16* idwt, int subband_width) rfx_dwt_2d_decode_block_sse2(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT idwt,
int subband_width)
{ {
INT16* hl = NULL; INT16* hl = NULL;
INT16* lh = NULL; INT16* lh = NULL;
@@ -321,7 +328,7 @@ rfx_dwt_2d_decode_block_sse2(INT16* buffer, INT16* idwt, int subband_width)
rfx_dwt_2d_decode_block_vert_sse2(l_dst, h_dst, buffer, subband_width); rfx_dwt_2d_decode_block_vert_sse2(l_dst, h_dst, buffer, subband_width);
} }
static void rfx_dwt_2d_decode_sse2(INT16* buffer, INT16* dwt_buffer) static void rfx_dwt_2d_decode_sse2(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(dwt_buffer); WINPR_ASSERT(dwt_buffer);
@@ -333,7 +340,8 @@ static void rfx_dwt_2d_decode_sse2(INT16* buffer, INT16* dwt_buffer)
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_encode_block_vert_sse2(INT16* src, INT16* l, INT16* h, int subband_width) rfx_dwt_2d_encode_block_vert_sse2(INT16* WINPR_RESTRICT src, INT16* WINPR_RESTRICT l,
INT16* WINPR_RESTRICT h, int subband_width)
{ {
int total_width = 0; int total_width = 0;
__m128i src_2n; __m128i src_2n;
@@ -383,7 +391,8 @@ rfx_dwt_2d_encode_block_vert_sse2(INT16* src, INT16* l, INT16* h, int subband_wi
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_encode_block_horiz_sse2(INT16* src, INT16* l, INT16* h, int subband_width) rfx_dwt_2d_encode_block_horiz_sse2(INT16* WINPR_RESTRICT src, INT16* WINPR_RESTRICT l,
INT16* WINPR_RESTRICT h, int subband_width)
{ {
int first = 0; int first = 0;
__m128i src_2n; __m128i src_2n;
@@ -432,7 +441,8 @@ rfx_dwt_2d_encode_block_horiz_sse2(INT16* src, INT16* l, INT16* h, int subband_w
} }
static __inline void __attribute__((ATTRIBUTES)) static __inline void __attribute__((ATTRIBUTES))
rfx_dwt_2d_encode_block_sse2(INT16* buffer, INT16* dwt, int subband_width) rfx_dwt_2d_encode_block_sse2(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt,
int subband_width)
{ {
INT16* hl = NULL; INT16* hl = NULL;
INT16* lh = NULL; INT16* lh = NULL;
@@ -457,7 +467,7 @@ rfx_dwt_2d_encode_block_sse2(INT16* buffer, INT16* dwt, int subband_width)
rfx_dwt_2d_encode_block_horiz_sse2(h_src, lh, hh, subband_width); rfx_dwt_2d_encode_block_horiz_sse2(h_src, lh, hh, subband_width);
} }
static void rfx_dwt_2d_encode_sse2(INT16* buffer, INT16* dwt_buffer) static void rfx_dwt_2d_encode_sse2(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer)
{ {
WINPR_ASSERT(buffer); WINPR_ASSERT(buffer);
WINPR_ASSERT(dwt_buffer); WINPR_ASSERT(dwt_buffer);

12
libfreerdp/codec/rfx_types.h
View File

@@ -165,11 +165,13 @@ struct S_RFX_CONTEXT
struct S_RFX_MESSAGE currentMessage; struct S_RFX_MESSAGE currentMessage;
/* routines */ /* routines */
void (*quantization_decode)(INT16* buffer, const UINT32* WINPR_RESTRICT quantization_values); void (*quantization_decode)(INT16* WINPR_RESTRICT buffer,
void (*quantization_encode)(INT16* buffer, const UINT32* WINPR_RESTRICT quantization_values); const UINT32* WINPR_RESTRICT quantization_values);
void (*dwt_2d_decode)(INT16* buffer, INT16* dwt_buffer); void (*quantization_encode)(INT16* WINPR_RESTRICT buffer,
void (*dwt_2d_extrapolate_decode)(INT16* src, INT16* temp); const UINT32* WINPR_RESTRICT quantization_values);
void (*dwt_2d_encode)(INT16* buffer, INT16* dwt_buffer); void (*dwt_2d_decode)(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer);
void (*dwt_2d_extrapolate_decode)(INT16* WINPR_RESTRICT src, INT16* WINPR_RESTRICT temp);
void (*dwt_2d_encode)(INT16* WINPR_RESTRICT buffer, INT16* WINPR_RESTRICT dwt_buffer);
int (*rlgr_decode)(RLGR_MODE mode, const BYTE* WINPR_RESTRICT data, UINT32 data_size, int (*rlgr_decode)(RLGR_MODE mode, const BYTE* WINPR_RESTRICT data, UINT32 data_size,
INT16* WINPR_RESTRICT buffer, UINT32 buffer_size); INT16* WINPR_RESTRICT buffer, UINT32 buffer_size);
int (*rlgr_encode)(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 data_size, int (*rlgr_encode)(RLGR_MODE mode, const INT16* WINPR_RESTRICT data, UINT32 data_size,