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

libfreerdp-core: clarification of bitmap decompression

Browse Source
This commit is contained in:
Marc-André Moreau
2012-01-03 18:22:42 -05:00
parent 9834eed119
commit 9dff0cd7f5
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/freerdp/secondary.h
View File

@@ -91,7 +91,10 @@ struct _CACHE_BITMAP_V2_ORDER
uint32 bitmapLength;
uint32 cacheIndex;
boolean compressed;
uint8 bitmapComprHdr[8];
uint32 cbCompFirstRowSize;
uint32 cbCompMainBodySize;
uint32 cbScanWidth;
uint32 cbUncompressedSize;
uint8* bitmapDataStream;
};
typedef struct _CACHE_BITMAP_V2_ORDER CACHE_BITMAP_V2_ORDER;

4
libfreerdp-cache/bitmap.c
View File

@@ -142,7 +142,7 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 inde
return NULL;
}
if (index == 0x7FFF)
if (index == BITMAP_CACHE_WAITING_LIST_INDEX)
index = bitmap_cache->cells[id].number - 1;
if (index > bitmap_cache->cells[id].number)
@@ -164,7 +164,7 @@ void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdp
return;
}
if (index == 0x7FFF)
if (index == BITMAP_CACHE_WAITING_LIST_INDEX)
index = bitmap_cache->cells[id].number - 1;
if (index > bitmap_cache->cells[id].number)

18
libfreerdp-codec/bitmap.c
View File

@@ -364,32 +364,42 @@ static int process_plane(uint8* in, int width, int height, uint8* out, int size)
*/
static boolean bitmap_decompress4(uint8* srcData, uint8* dstData, int width, int height, int size)
{
int RLE;
int code;
int NoAlpha;
int bytes_pro;
int total_pro;
int RLE;
int NA; /* no alpha */
code = IN_UINT8_MV(srcData);
RLE = code & 0x10;
if (RLE == 0)
{
/* FIXME: sometimes sent by windows 8 */
return false;
}
total_pro = 1;
NA = code & 0x20;
if (NA == 0)
NoAlpha = code & 0x20;
if (NoAlpha == 0)
{
bytes_pro = process_plane(srcData, width, height, dstData + 3, size - total_pro);
total_pro += bytes_pro;
srcData += bytes_pro;
}
bytes_pro = process_plane(srcData, width, height, dstData + 2, size - total_pro);
total_pro += bytes_pro;
srcData += bytes_pro;
bytes_pro = process_plane(srcData, width, height, dstData + 1, size - total_pro);
total_pro += bytes_pro;
srcData += bytes_pro;
bytes_pro = process_plane(srcData, width, height, dstData + 0, size - total_pro);
total_pro += bytes_pro;
return (size == total_pro) ? true : false;
}

13
libfreerdp-core/orders.c
View File

@@ -1241,13 +1241,18 @@ void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_b
update_read_4byte_unsigned(s, &cache_bitmap_v2_order->bitmapLength); /* bitmapLength */
update_read_2byte_unsigned(s, &cache_bitmap_v2_order->cacheIndex); /* cacheIndex */
if (cache_bitmap_v2_order->flags & CBR2_DO_NOT_CACHE)
cache_bitmap_v2_order->cacheIndex = BITMAP_CACHE_WAITING_LIST_INDEX;
if (compressed)
{
if ((cache_bitmap_v2_order->flags & CBR2_NO_BITMAP_COMPRESSION_HDR) == 0)
if (!(cache_bitmap_v2_order->flags & CBR2_NO_BITMAP_COMPRESSION_HDR))
{
uint8* bitmapComprHdr = (uint8*) &cache_bitmap_v2_order->bitmapComprHdr;
stream_read(s, bitmapComprHdr, 8); /* bitmapComprHdr (8 bytes) */
cache_bitmap_v2_order->bitmapLength -= 8;
stream_read_uint16(s, cache_bitmap_v2_order->cbCompFirstRowSize); /* cbCompFirstRowSize (2 bytes) */
stream_read_uint16(s, cache_bitmap_v2_order->cbCompMainBodySize); /* cbCompMainBodySize (2 bytes) */
stream_read_uint16(s, cache_bitmap_v2_order->cbScanWidth); /* cbScanWidth (2 bytes) */
stream_read_uint16(s, cache_bitmap_v2_order->cbUncompressedSize); /* cbUncompressedSize (2 bytes) */
cache_bitmap_v2_order->bitmapLength = cache_bitmap_v2_order->cbCompMainBodySize;
}
stream_get_mark(s, cache_bitmap_v2_order->bitmapDataStream);