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

libfreerdp-codec: start adding support for RDP4 MPPC

Browse Source
This commit is contained in:
Marc-André Moreau 2014-03-09 13:37:46 -04:00
parent 16c176dd5f
commit 11e0830884
2 changed files with 189 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libfreerdp/codec/mppc.c
View File

@ -208,6 +208,8 @@ UINT32 mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT3
CopyOffset = 0;
if (mppc->CompressionLevel) /* RDP5 */
{
if ((accumulator & 0xF8000000) == 0xF8000000)
{
/**
@ -252,6 +254,44 @@ UINT32 mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT3
{
/* Invalid CopyOffset Encoding */
}
}
else /* RDP4 */
{
if ((accumulator & 0xF0000000) == 0xF0000000)
{
/**
* CopyOffset, range [0, 63]
* bits 1111 + lower 6 bits of CopyOffset
*/
CopyOffset = ((accumulator >> 22) & 0x3F);
BitStream_Shift(bs, 10);
}
else if ((accumulator & 0xF0000000) == 0xE0000000)
{
/**
* CopyOffset, range [64, 319]
* bits 1110 + lower 8 bits of (CopyOffset - 64)
*/
CopyOffset = ((accumulator >> 20) & 0xFF) + 64;
BitStream_Shift(bs, 12);
}
else if ((accumulator & 0xE0000000) == 0xC0000000)
{
/**
* CopyOffset, range [320, 8191]
* bits 110 + lower 13 bits of (CopyOffset - 320)
*/
CopyOffset = ((accumulator >> 16) & 0x1FFF) + 320;
BitStream_Shift(bs, 16);
}
else
{
/* Invalid CopyOffset Encoding */
}
}
/**
* LengthOfMatch Encoding
@ -380,7 +420,7 @@ UINT32 mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT3
LengthOfMatch = ((accumulator >> 8) & 0x0FFF) + 0x1000;
BitStream_Shift(bs, 24);
}
else if ((accumulator & 0xFFF80000) == 0xFFF00000)
else if (((accumulator & 0xFFF80000) == 0xFFF00000) && mppc->CompressionLevel) /* RDP5 */
{
/**
* LengthOfMatch [8192, 16383]
@ -390,7 +430,7 @@ UINT32 mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT3
LengthOfMatch = ((accumulator >> 6) & 0x1FFF) + 0x2000;
BitStream_Shift(bs, 26);
}
else if ((accumulator & 0xFFFC0000) == 0xFFF80000)
else if (((accumulator & 0xFFFC0000) == 0xFFF80000) && mppc->CompressionLevel) /* RDP5 */
{
/**
* LengthOfMatch [16384, 32767]
@ -400,7 +440,7 @@ UINT32 mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT3
LengthOfMatch = ((accumulator >> 4) & 0x3FFF) + 0x4000;
BitStream_Shift(bs, 28);
}
else if ((accumulator & 0xFFFE0000) == 0xFFFC0000)
else if (((accumulator & 0xFFFE0000) == 0xFFFC0000) && mppc->CompressionLevel) /* RDP5 */
{
/**
* LengthOfMatch [32768, 65535]
@ -521,6 +561,8 @@ UINT32 mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT32*
/* Encode CopyOffset */
if (mppc->CompressionLevel) /* RDP5 */
{
if (CopyOffset < 64)
{
/* bits 11111 + lower 6 bits of CopyOffset */
@ -545,6 +587,28 @@ UINT32 mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT32*
accumulator = 0x060000 | ((CopyOffset - 2368) & 0xFFFF);
BitStream_Write_Bits(mppc->bs, accumulator, 19);
}
}
else /* RDP4 */
{
if (CopyOffset < 64)
{
/* bits 1111 + lower 6 bits of CopyOffset */
accumulator = 0x03C0 | (CopyOffset & 0x003F);
BitStream_Write_Bits(mppc->bs, accumulator, 10);
}
else if ((CopyOffset >= 64) && (CopyOffset < 320))
{
/* bits 1110 + lower 8 bits of (CopyOffset - 64) */
accumulator = 0x0E00 | ((CopyOffset - 64) & 0x00FF);
BitStream_Write_Bits(mppc->bs, accumulator, 12);
}
else if ((CopyOffset >= 320) && (CopyOffset < 8192))
{
/* bits 110 + lower 13 bits of (CopyOffset - 320) */
accumulator = 0xC000 | ((CopyOffset - 320) & 0x1FFF);
BitStream_Write_Bits(mppc->bs, accumulator, 16);
}
}
/* Encode LengthOfMatch */
@ -619,19 +683,19 @@ UINT32 mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, BYTE* pDstData, UINT32*
accumulator = 0xFFE000 | (LengthOfMatch & 0x0FFF);
BitStream_Write_Bits(mppc->bs, accumulator, 24);
}
else if ((LengthOfMatch >= 8192) && (LengthOfMatch < 16384))
else if (((LengthOfMatch >= 8192) && (LengthOfMatch < 16384)) && mppc->CompressionLevel) /* RDP5 */
{
/* 1111111111110 + 13 lower bits of LengthOfMatch */
accumulator = 0x3FFC000 | (LengthOfMatch & 0x1FFF);
BitStream_Write_Bits(mppc->bs, accumulator, 26);
}
else if ((LengthOfMatch >= 16384) && (LengthOfMatch < 32768))
else if (((LengthOfMatch >= 16384) && (LengthOfMatch < 32768)) && mppc->CompressionLevel) /* RDP5 */
{
/* 11111111111110 + 14 lower bits of LengthOfMatch */
accumulator = 0xFFF8000 | (LengthOfMatch & 0x3FFF);
BitStream_Write_Bits(mppc->bs, accumulator, 28);
}
else if ((LengthOfMatch >= 32768) && (LengthOfMatch < 65536))
else if (((LengthOfMatch >= 32768) && (LengthOfMatch < 65536)) && mppc->CompressionLevel) /* RDP5 */
{
/* 111111111111110 + 15 lower bits of LengthOfMatch */
accumulator = 0x3FFF0000 | (LengthOfMatch & 0x7FFF);

67
libfreerdp/codec/test/TestFreeRDPCodecMppc.c
View File

@ -706,7 +706,7 @@ const BYTE TEST_MPPC_BELLS_RDP5[] =
"\x6c\x2e\x74\x6f\x6c\x6c\x73\x2c\xfa\x1b\x97\x33\x7e\x87\xe3\x32"
"\x90\x80";
int test_MppcCompressBells()
int test_MppcCompressBellsRdp5()
{
UINT32 size;
UINT32 flags;
@ -738,7 +738,39 @@ int test_MppcCompressBells()
return 0;
}
int test_MppcDecompressBells()
int test_MppcCompressBellsRdp4()
{
UINT32 size;
UINT32 flags;
BYTE* pSrcData;
MPPC_CONTEXT* mppc;
BYTE OutputBuffer[65536];
mppc = mppc_context_new(0, TRUE);
size = sizeof(TEST_MPPC_BELLS) - 1;
pSrcData = (BYTE*) TEST_MPPC_BELLS;
printf("%s\n", pSrcData);
flags = mppc_compress(mppc, pSrcData, OutputBuffer, &size);
printf("flags: 0x%04X size: %d\n", flags, size);
if (memcmp(OutputBuffer, TEST_MPPC_BELLS_RDP4, size) != 0)
{
printf("Actual:\n");
BitDump(OutputBuffer, size * 8, BITDUMP_MSB_FIRST);
printf("Expected:\n");
BitDump(TEST_MPPC_BELLS_RDP4, size * 8, BITDUMP_MSB_FIRST);
}
mppc_context_free(mppc);
return 0;
}
int test_MppcDecompressBellsRdp5()
{
UINT32 size;
UINT32 flags;
@ -775,6 +807,30 @@ int test_MppcDecompressBells()
return 0;
}
int test_MppcDecompressBellsRdp4()
{
UINT32 size;
UINT32 flags;
BYTE* pSrcData;
MPPC_CONTEXT* mppc;
BYTE OutputBuffer[65536];
mppc = mppc_context_new(0, FALSE);
size = sizeof(TEST_MPPC_BELLS_RDP4) - 1;
pSrcData = (BYTE*) TEST_MPPC_BELLS_RDP4;
flags = PACKET_AT_FRONT | PACKET_COMPRESSED | 0;
flags = mppc_decompress(mppc, pSrcData, OutputBuffer, &size, flags);
printf("flags: 0x%04X size: %d\n", flags, size);
printf("%s\n", OutputBuffer);
mppc_context_free(mppc);
return 0;
}
int test_MppcCompressBuffer()
{
UINT32 size;
@ -803,8 +859,11 @@ int test_MppcCompressBuffer()
int TestFreeRDPCodecMppc(int argc, char* argv[])
{
//test_MppcCompressBells();
test_MppcDecompressBells();
//test_MppcCompressBellsRdp5();
//test_MppcDecompressBellsRdp5();
test_MppcCompressBellsRdp4();
//test_MppcDecompressBellsRdp4();
return 0;
}