From dfbd4cb9fbd7f53b0f6d0e9ed96f1daad4bf5d38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 13 Aug 2013 17:50:05 -0400 Subject: [PATCH] libfreerdp-codec: refactor encoder to use message-centric interface --- include/freerdp/codec/rfx.h | 2 + libfreerdp/codec/rfx.c | 101 +++++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 48 deletions(-) diff --git a/include/freerdp/codec/rfx.h b/include/freerdp/codec/rfx.h index 865311f..891f65a 100644 --- a/include/freerdp/codec/rfx.h +++ b/include/freerdp/codec/rfx.h @@ -72,6 +72,8 @@ typedef struct _RFX_TILE RFX_TILE; struct _RFX_MESSAGE { + UINT32 frameIdx; + /** * The rects array represents the updated region of the frame. The UI * requires to clip drawing destination base on the union of the rects. diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index c3a838c..db4cfb0 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -984,48 +984,6 @@ void rfx_compose_message_header(RFX_CONTEXT* context, wStream* s) rfx_compose_message_channels(context, s); } -static void rfx_compose_message_frame_begin(RFX_CONTEXT* context, wStream* s) -{ - Stream_EnsureRemainingCapacity(s, 14); - - Stream_Write_UINT16(s, WBT_FRAME_BEGIN); /* CodecChannelT.blockType */ - Stream_Write_UINT32(s, 14); /* CodecChannelT.blockLen */ - Stream_Write_UINT8(s, 1); /* CodecChannelT.codecId */ - Stream_Write_UINT8(s, 0); /* CodecChannelT.channelId */ - Stream_Write_UINT32(s, context->frameIdx); /* frameIdx */ - Stream_Write_UINT16(s, 1); /* numRegions */ - - context->frameIdx++; -} - -static void rfx_compose_message_region(RFX_CONTEXT* context, wStream* s, - const RFX_RECT* rects, int numRects) -{ - int i; - UINT32 blockLen; - - blockLen = 15 + (numRects * 8); - Stream_EnsureRemainingCapacity(s, blockLen); - - Stream_Write_UINT16(s, WBT_REGION); /* CodecChannelT.blockType (2 bytes) */ - Stream_Write_UINT32(s, blockLen); /* set CodecChannelT.blockLen (4 bytes) */ - Stream_Write_UINT8(s, 1); /* CodecChannelT.codecId (1 byte) */ - Stream_Write_UINT8(s, 0); /* CodecChannelT.channelId (1 byte) */ - Stream_Write_UINT8(s, 1); /* regionFlags (1 byte) */ - Stream_Write_UINT16(s, numRects); /* numRects (2 bytes) */ - - for (i = 0; i < numRects; i++) - { - Stream_Write_UINT16(s, rects[i].x); - Stream_Write_UINT16(s, rects[i].y); - Stream_Write_UINT16(s, rects[i].width); - Stream_Write_UINT16(s, rects[i].height); - } - - Stream_Write_UINT16(s, CBT_REGION); /* regionType (2 bytes) */ - Stream_Write_UINT16(s, 1); /* numTilesets (2 bytes) */ -} - static int rfx_tile_length(RFX_TILE* tile) { return 19 + tile->YLen + tile->CbLen + tile->CrLen; @@ -1066,7 +1024,8 @@ void CALLBACK rfx_compose_message_tile_work_callback(PTP_CALLBACK_INSTANCE insta rfx_encode_rgb(param->context, param->tile); } -RFX_MESSAGE* rfx_compose_message_full(RFX_CONTEXT* context, BYTE* data, int width, int height, int scanline) +RFX_MESSAGE* rfx_compose_message_full(RFX_CONTEXT* context, const RFX_RECT* rects, + int numRects, BYTE* data, int width, int height, int scanline) { int i; int xIdx; @@ -1081,6 +1040,11 @@ RFX_MESSAGE* rfx_compose_message_full(RFX_CONTEXT* context, BYTE* data, int widt message = (RFX_MESSAGE*) malloc(sizeof(RFX_MESSAGE)); ZeroMemory(message, sizeof(RFX_MESSAGE)); + message->frameIdx = context->frameIdx++; + + message->numRects = numRects; + message->rects = (RFX_RECT*) rects; + if (!context->numQuant) { context->numQuant = 1; @@ -1214,7 +1178,46 @@ static void rfx_write_message_tileset(RFX_CONTEXT* context, wStream* s, RFX_MESS message->numQuant, message->numTiles, message->tilesDataSize); } -static void rfx_compose_message_frame_end(RFX_CONTEXT* context, wStream* s) +void rfx_write_message_frame_begin(RFX_CONTEXT* context, wStream* s, RFX_MESSAGE* message) +{ + Stream_EnsureRemainingCapacity(s, 14); + + Stream_Write_UINT16(s, WBT_FRAME_BEGIN); /* CodecChannelT.blockType */ + Stream_Write_UINT32(s, 14); /* CodecChannelT.blockLen */ + Stream_Write_UINT8(s, 1); /* CodecChannelT.codecId */ + Stream_Write_UINT8(s, 0); /* CodecChannelT.channelId */ + Stream_Write_UINT32(s, message->frameIdx); /* frameIdx */ + Stream_Write_UINT16(s, 1); /* numRegions */ +} + +void rfx_write_message_region(RFX_CONTEXT* context, wStream* s, RFX_MESSAGE* message) +{ + int i; + UINT32 blockLen; + + blockLen = 15 + (message->numRects * 8); + Stream_EnsureRemainingCapacity(s, blockLen); + + Stream_Write_UINT16(s, WBT_REGION); /* CodecChannelT.blockType (2 bytes) */ + Stream_Write_UINT32(s, blockLen); /* set CodecChannelT.blockLen (4 bytes) */ + Stream_Write_UINT8(s, 1); /* CodecChannelT.codecId (1 byte) */ + Stream_Write_UINT8(s, 0); /* CodecChannelT.channelId (1 byte) */ + Stream_Write_UINT8(s, 1); /* regionFlags (1 byte) */ + Stream_Write_UINT16(s, message->numRects); /* numRects (2 bytes) */ + + for (i = 0; i < message->numRects; i++) + { + Stream_Write_UINT16(s, message->rects[i].x); + Stream_Write_UINT16(s, message->rects[i].y); + Stream_Write_UINT16(s, message->rects[i].width); + Stream_Write_UINT16(s, message->rects[i].height); + } + + Stream_Write_UINT16(s, CBT_REGION); /* regionType (2 bytes) */ + Stream_Write_UINT16(s, 1); /* numTilesets (2 bytes) */ +} + +void rfx_write_message_frame_end(RFX_CONTEXT* context, wStream* s, RFX_MESSAGE* message) { Stream_EnsureRemainingCapacity(s, 8); @@ -1235,13 +1238,15 @@ FREERDP_API void rfx_compose_message(RFX_CONTEXT* context, wStream* s, context->state = RFX_STATE_SEND_FRAME_DATA; } - rfx_compose_message_frame_begin(context, s); - rfx_compose_message_region(context, s, rects, numRects); + message = rfx_compose_message_full(context, rects, numRects, data, width, height, scanline); - message = rfx_compose_message_full(context, data, width, height, scanline); + rfx_write_message_frame_begin(context, s, message); + rfx_write_message_region(context, s, message); rfx_write_message_tileset(context, s, message); + rfx_write_message_frame_end(context, s, message); - rfx_compose_message_frame_end(context, s); + message->rects = NULL; + message->numRects = 0; rfx_message_free(context, message); } -- 2.7.4