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

Inlined heavy used functions.

Browse Source
This commit is contained in:
Armin Novak 2017-01-16 10:25:12 +01:00
parent 948e633ed3
commit 4d40b3c58e
3 changed files with 52 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libfreerdp/codec/mppc.c
View File

@ -34,7 +34,7 @@
#define MPPC_MATCH_INDEX(_sym1, _sym2, _sym3) \ #define MPPC_MATCH_INDEX(_sym1, _sym2, _sym3) \
((((MPPC_MATCH_TABLE[_sym3] << 16) + (MPPC_MATCH_TABLE[_sym2] << 8) + MPPC_MATCH_TABLE[_sym1]) & 0x07FFF000) >> 12) ((((MPPC_MATCH_TABLE[_sym3] << 16) + (MPPC_MATCH_TABLE[_sym2] << 8) + MPPC_MATCH_TABLE[_sym1]) & 0x07FFF000) >> 12)
const UINT32 MPPC_MATCH_TABLE[256] = static const UINT32 MPPC_MATCH_TABLE[256] =
{ {
0x00000000, 0x009CCF93, 0x01399F26, 0x01D66EB9, 0x02733E4C, 0x03100DDF, 0x03ACDD72, 0x0449AD05, 0x00000000, 0x009CCF93, 0x01399F26, 0x01D66EB9, 0x02733E4C, 0x03100DDF, 0x03ACDD72, 0x0449AD05,
0x04E67C98, 0x05834C2B, 0x06201BBE, 0x06BCEB51, 0x0759BAE4, 0x07F68A77, 0x08935A0A, 0x0930299D, 0x04E67C98, 0x05834C2B, 0x06201BBE, 0x06BCEB51, 0x0759BAE4, 0x07F68A77, 0x08935A0A, 0x0930299D,
@ -72,7 +72,8 @@ const UINT32 MPPC_MATCH_TABLE[256] =
//#define DEBUG_MPPC 1 //#define DEBUG_MPPC 1
int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData,
UINT32* pDstSize, UINT32 flags)
{ {
BYTE Literal; BYTE Literal;
BYTE* SrcPtr; BYTE* SrcPtr;
@ -86,12 +87,10 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
UINT32 HistoryBufferSize; UINT32 HistoryBufferSize;
UINT32 CompressionLevel; UINT32 CompressionLevel;
wBitStream* bs = mppc->bs; wBitStream* bs = mppc->bs;
HistoryBuffer = mppc->HistoryBuffer; HistoryBuffer = mppc->HistoryBuffer;
HistoryBufferSize = mppc->HistoryBufferSize; HistoryBufferSize = mppc->HistoryBufferSize;
HistoryBufferEnd = &HistoryBuffer[HistoryBufferSize - 1]; HistoryBufferEnd = &HistoryBuffer[HistoryBufferSize - 1];
CompressionLevel = mppc->CompressionLevel; CompressionLevel = mppc->CompressionLevel;
BitStream_Attach(bs, pSrcData, SrcSize); BitStream_Attach(bs, pSrcData, SrcSize);
BitStream_Fetch(bs); BitStream_Fetch(bs);
@ -138,14 +137,10 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* Literal, less than 0x80 * Literal, less than 0x80
* bit 0 followed by the lower 7 bits of the literal * bit 0 followed by the lower 7 bits of the literal
*/ */
Literal = ((accumulator & 0x7F000000) >> 24); Literal = ((accumulator & 0x7F000000) >> 24);
*(HistoryPtr) = Literal; *(HistoryPtr) = Literal;
HistoryPtr++; HistoryPtr++;
BitStream_Shift(bs, 8); BitStream_Shift(bs, 8);
continue; continue;
} }
else if ((accumulator & 0xC0000000) == 0x80000000) else if ((accumulator & 0xC0000000) == 0x80000000)
@ -154,21 +149,16 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* Literal, greater than 0x7F * Literal, greater than 0x7F
* bits 10 followed by the lower 7 bits of the literal * bits 10 followed by the lower 7 bits of the literal
*/ */
Literal = ((accumulator & 0x3F800000) >> 23) + 0x80; Literal = ((accumulator & 0x3F800000) >> 23) + 0x80;
*(HistoryPtr) = Literal; *(HistoryPtr) = Literal;
HistoryPtr++; HistoryPtr++;
BitStream_Shift(bs, 9); BitStream_Shift(bs, 9);
continue; continue;
} }
/** /**
* CopyOffset Encoding * CopyOffset Encoding
*/ */
CopyOffset = 0; CopyOffset = 0;
if (CompressionLevel) /* RDP5 */ if (CompressionLevel) /* RDP5 */
@ -179,7 +169,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [0, 63] * CopyOffset, range [0, 63]
* bits 11111 + lower 6 bits of CopyOffset * bits 11111 + lower 6 bits of CopyOffset
*/ */
CopyOffset = ((accumulator >> 21) & 0x3F); CopyOffset = ((accumulator >> 21) & 0x3F);
BitStream_Shift(bs, 11); BitStream_Shift(bs, 11);
} }
@ -189,7 +178,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [64, 319] * CopyOffset, range [64, 319]
* bits 11110 + lower 8 bits of (CopyOffset - 64) * bits 11110 + lower 8 bits of (CopyOffset - 64)
*/ */
CopyOffset = ((accumulator >> 19) & 0xFF) + 64; CopyOffset = ((accumulator >> 19) & 0xFF) + 64;
BitStream_Shift(bs, 13); BitStream_Shift(bs, 13);
} }
@ -199,7 +187,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [320, 2367] * CopyOffset, range [320, 2367]
* bits 1110 + lower 11 bits of (CopyOffset - 320) * bits 1110 + lower 11 bits of (CopyOffset - 320)
*/ */
CopyOffset = ((accumulator >> 17) & 0x7FF) + 320; CopyOffset = ((accumulator >> 17) & 0x7FF) + 320;
BitStream_Shift(bs, 15); BitStream_Shift(bs, 15);
} }
@ -209,7 +196,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [2368, ] * CopyOffset, range [2368, ]
* bits 110 + lower 16 bits of (CopyOffset - 2368) * bits 110 + lower 16 bits of (CopyOffset - 2368)
*/ */
CopyOffset = ((accumulator >> 13) & 0xFFFF) + 2368; CopyOffset = ((accumulator >> 13) & 0xFFFF) + 2368;
BitStream_Shift(bs, 19); BitStream_Shift(bs, 19);
} }
@ -227,7 +213,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [0, 63] * CopyOffset, range [0, 63]
* bits 1111 + lower 6 bits of CopyOffset * bits 1111 + lower 6 bits of CopyOffset
*/ */
CopyOffset = ((accumulator >> 22) & 0x3F); CopyOffset = ((accumulator >> 22) & 0x3F);
BitStream_Shift(bs, 10); BitStream_Shift(bs, 10);
} }
@ -237,7 +222,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [64, 319] * CopyOffset, range [64, 319]
* bits 1110 + lower 8 bits of (CopyOffset - 64) * bits 1110 + lower 8 bits of (CopyOffset - 64)
*/ */
CopyOffset = ((accumulator >> 20) & 0xFF) + 64; CopyOffset = ((accumulator >> 20) & 0xFF) + 64;
BitStream_Shift(bs, 12); BitStream_Shift(bs, 12);
} }
@ -247,7 +231,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* CopyOffset, range [320, 8191] * CopyOffset, range [320, 8191]
* bits 110 + lower 13 bits of (CopyOffset - 320) * bits 110 + lower 13 bits of (CopyOffset - 320)
*/ */
CopyOffset = ((accumulator >> 16) & 0x1FFF) + 320; CopyOffset = ((accumulator >> 16) & 0x1FFF) + 320;
BitStream_Shift(bs, 16); BitStream_Shift(bs, 16);
} }
@ -261,7 +244,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
/** /**
* LengthOfMatch Encoding * LengthOfMatch Encoding
*/ */
LengthOfMatch = 0; LengthOfMatch = 0;
accumulator = bs->accumulator; accumulator = bs->accumulator;
@ -271,7 +253,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [3] * LengthOfMatch [3]
* bit 0 + 0 lower bits of LengthOfMatch * bit 0 + 0 lower bits of LengthOfMatch
*/ */
LengthOfMatch = 3; LengthOfMatch = 3;
BitStream_Shift(bs, 1); BitStream_Shift(bs, 1);
} }
@ -281,7 +262,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [4, 7] * LengthOfMatch [4, 7]
* bits 10 + 2 lower bits of LengthOfMatch * bits 10 + 2 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 28) & 0x0003) + 0x0004; LengthOfMatch = ((accumulator >> 28) & 0x0003) + 0x0004;
BitStream_Shift(bs, 4); BitStream_Shift(bs, 4);
} }
@ -291,7 +271,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [8, 15] * LengthOfMatch [8, 15]
* bits 110 + 3 lower bits of LengthOfMatch * bits 110 + 3 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 26) & 0x0007) + 0x0008; LengthOfMatch = ((accumulator >> 26) & 0x0007) + 0x0008;
BitStream_Shift(bs, 6); BitStream_Shift(bs, 6);
} }
@ -301,7 +280,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [16, 31] * LengthOfMatch [16, 31]
* bits 1110 + 4 lower bits of LengthOfMatch * bits 1110 + 4 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 24) & 0x000F) + 0x0010; LengthOfMatch = ((accumulator >> 24) & 0x000F) + 0x0010;
BitStream_Shift(bs, 8); BitStream_Shift(bs, 8);
} }
@ -311,7 +289,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [32, 63] * LengthOfMatch [32, 63]
* bits 11110 + 5 lower bits of LengthOfMatch * bits 11110 + 5 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 22) & 0x001F) + 0x0020; LengthOfMatch = ((accumulator >> 22) & 0x001F) + 0x0020;
BitStream_Shift(bs, 10); BitStream_Shift(bs, 10);
} }
@ -321,7 +298,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [64, 127] * LengthOfMatch [64, 127]
* bits 111110 + 6 lower bits of LengthOfMatch * bits 111110 + 6 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 20) & 0x003F) + 0x0040; LengthOfMatch = ((accumulator >> 20) & 0x003F) + 0x0040;
BitStream_Shift(bs, 12); BitStream_Shift(bs, 12);
} }
@ -331,7 +307,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [128, 255] * LengthOfMatch [128, 255]
* bits 1111110 + 7 lower bits of LengthOfMatch * bits 1111110 + 7 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 18) & 0x007F) + 0x0080; LengthOfMatch = ((accumulator >> 18) & 0x007F) + 0x0080;
BitStream_Shift(bs, 14); BitStream_Shift(bs, 14);
} }
@ -341,7 +316,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [256, 511] * LengthOfMatch [256, 511]
* bits 11111110 + 8 lower bits of LengthOfMatch * bits 11111110 + 8 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 16) & 0x00FF) + 0x0100; LengthOfMatch = ((accumulator >> 16) & 0x00FF) + 0x0100;
BitStream_Shift(bs, 16); BitStream_Shift(bs, 16);
} }
@ -351,7 +325,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [512, 1023] * LengthOfMatch [512, 1023]
* bits 111111110 + 9 lower bits of LengthOfMatch * bits 111111110 + 9 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 14) & 0x01FF) + 0x0200; LengthOfMatch = ((accumulator >> 14) & 0x01FF) + 0x0200;
BitStream_Shift(bs, 18); BitStream_Shift(bs, 18);
} }
@ -361,7 +334,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [1024, 2047] * LengthOfMatch [1024, 2047]
* bits 1111111110 + 10 lower bits of LengthOfMatch * bits 1111111110 + 10 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 12) & 0x03FF) + 0x0400; LengthOfMatch = ((accumulator >> 12) & 0x03FF) + 0x0400;
BitStream_Shift(bs, 20); BitStream_Shift(bs, 20);
} }
@ -371,7 +343,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [2048, 4095] * LengthOfMatch [2048, 4095]
* bits 11111111110 + 11 lower bits of LengthOfMatch * bits 11111111110 + 11 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 10) & 0x07FF) + 0x0800; LengthOfMatch = ((accumulator >> 10) & 0x07FF) + 0x0800;
BitStream_Shift(bs, 22); BitStream_Shift(bs, 22);
} }
@ -381,7 +352,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [4096, 8191] * LengthOfMatch [4096, 8191]
* bits 111111111110 + 12 lower bits of LengthOfMatch * bits 111111111110 + 12 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 8) & 0x0FFF) + 0x1000; LengthOfMatch = ((accumulator >> 8) & 0x0FFF) + 0x1000;
BitStream_Shift(bs, 24); BitStream_Shift(bs, 24);
} }
@ -391,7 +361,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [8192, 16383] * LengthOfMatch [8192, 16383]
* bits 1111111111110 + 13 lower bits of LengthOfMatch * bits 1111111111110 + 13 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 6) & 0x1FFF) + 0x2000; LengthOfMatch = ((accumulator >> 6) & 0x1FFF) + 0x2000;
BitStream_Shift(bs, 26); BitStream_Shift(bs, 26);
} }
@ -401,7 +370,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [16384, 32767] * LengthOfMatch [16384, 32767]
* bits 11111111111110 + 14 lower bits of LengthOfMatch * bits 11111111111110 + 14 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 4) & 0x3FFF) + 0x4000; LengthOfMatch = ((accumulator >> 4) & 0x3FFF) + 0x4000;
BitStream_Shift(bs, 28); BitStream_Shift(bs, 28);
} }
@ -411,7 +379,6 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
* LengthOfMatch [32768, 65535] * LengthOfMatch [32768, 65535]
* bits 111111111111110 + 15 lower bits of LengthOfMatch * bits 111111111111110 + 15 lower bits of LengthOfMatch
*/ */
LengthOfMatch = ((accumulator >> 2) & 0x7FFF) + 0x8000; LengthOfMatch = ((accumulator >> 2) & 0x7FFF) + 0x8000;
BitStream_Shift(bs, 30); BitStream_Shift(bs, 30);
} }
@ -431,21 +398,24 @@ int mppc_decompress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** p
return -1005; return -1005;
} }
SrcPtr = &HistoryBuffer[(HistoryPtr - HistoryBuffer - CopyOffset) & (CompressionLevel ? 0xFFFF : 0x1FFF)]; SrcPtr = &HistoryBuffer[(HistoryPtr - HistoryBuffer - CopyOffset) & (CompressionLevel ? 0xFFFF :
0x1FFF)];
do { do
{
*HistoryPtr++ = *SrcPtr++; *HistoryPtr++ = *SrcPtr++;
} while (--LengthOfMatch); }
while (--LengthOfMatch);
} }
*pDstSize = (UINT32) (HistoryPtr - mppc->HistoryPtr); *pDstSize = (UINT32)(HistoryPtr - mppc->HistoryPtr);
*ppDstData = mppc->HistoryPtr; *ppDstData = mppc->HistoryPtr;
mppc->HistoryPtr = HistoryPtr; mppc->HistoryPtr = HistoryPtr;
return 1; return 1;
} }
int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData,
UINT32* pDstSize, UINT32* pFlags)
{ {
BYTE* pSrcPtr; BYTE* pSrcPtr;
BYTE* pSrcEnd; BYTE* pSrcEnd;
@ -466,14 +436,11 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
BYTE Sym1, Sym2, Sym3; BYTE Sym1, Sym2, Sym3;
UINT32 CompressionLevel; UINT32 CompressionLevel;
wBitStream* bs = mppc->bs; wBitStream* bs = mppc->bs;
HistoryBuffer = mppc->HistoryBuffer; HistoryBuffer = mppc->HistoryBuffer;
HistoryBufferSize = mppc->HistoryBufferSize; HistoryBufferSize = mppc->HistoryBufferSize;
CompressionLevel = mppc->CompressionLevel; CompressionLevel = mppc->CompressionLevel;
HistoryPtr = mppc->HistoryPtr; HistoryPtr = mppc->HistoryPtr;
HistoryOffset = mppc->HistoryOffset; HistoryOffset = mppc->HistoryOffset;
*pFlags = 0; *pFlags = 0;
PacketFlushed = FALSE; PacketFlushed = FALSE;
@ -491,7 +458,6 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
} }
HistoryPtr = &(HistoryBuffer[HistoryOffset]); HistoryPtr = &(HistoryBuffer[HistoryOffset]);
pDstData = *ppDstData; pDstData = *ppDstData;
if (!pDstData) if (!pDstData)
@ -503,7 +469,6 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
DstSize = *pDstSize; DstSize = *pDstSize;
BitStream_Attach(bs, pDstData, DstSize); BitStream_Attach(bs, pDstData, DstSize);
pSrcPtr = pSrcData; pSrcPtr = pSrcData;
pSrcEnd = &(pSrcData[SrcSize - 1]); pSrcEnd = &(pSrcData[SrcSize - 1]);
pDstEnd = &(pDstData[DstSize - 1]); pDstEnd = &(pDstData[DstSize - 1]);
@ -513,21 +478,19 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
Sym1 = pSrcPtr[0]; Sym1 = pSrcPtr[0];
Sym2 = pSrcPtr[1]; Sym2 = pSrcPtr[1];
Sym3 = pSrcPtr[2]; Sym3 = pSrcPtr[2];
*HistoryPtr++ = *pSrcPtr++; *HistoryPtr++ = *pSrcPtr++;
MatchIndex = MPPC_MATCH_INDEX(Sym1, Sym2, Sym3); MatchIndex = MPPC_MATCH_INDEX(Sym1, Sym2, Sym3);
MatchPtr = &(HistoryBuffer[mppc->MatchBuffer[MatchIndex]]); MatchPtr = &(HistoryBuffer[mppc->MatchBuffer[MatchIndex]]);
if (MatchPtr != (HistoryPtr - 1)) if (MatchPtr != (HistoryPtr - 1))
mppc->MatchBuffer[MatchIndex] = (UINT16) (HistoryPtr - HistoryBuffer); mppc->MatchBuffer[MatchIndex] = (UINT16)(HistoryPtr - HistoryBuffer);
if (mppc->HistoryPtr < HistoryPtr) if (mppc->HistoryPtr < HistoryPtr)
mppc->HistoryPtr = HistoryPtr; mppc->HistoryPtr = HistoryPtr;
if ((Sym1 != *(MatchPtr - 1)) || (Sym2 != MatchPtr[0]) || (Sym3 != MatchPtr[1]) || if ((Sym1 != *(MatchPtr - 1)) || (Sym2 != MatchPtr[0]) || (Sym3 != MatchPtr[1]) ||
(&MatchPtr[1] > mppc->HistoryPtr) || (MatchPtr == HistoryBuffer) || (&MatchPtr[1] > mppc->HistoryPtr) || (MatchPtr == HistoryBuffer) ||
(MatchPtr == (HistoryPtr - 1)) || (MatchPtr == HistoryPtr)) (MatchPtr == (HistoryPtr - 1)) || (MatchPtr == HistoryPtr))
{ {
if (((bs->position / 8) + 2) > (DstSize - 1)) if (((bs->position / 8) + 2) > (DstSize - 1))
{ {
@ -540,7 +503,6 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
} }
accumulator = Sym1; accumulator = Sym1;
#ifdef DEBUG_MPPC #ifdef DEBUG_MPPC
WLog_DBG(TAG, "%"PRIu32"", accumulator); WLog_DBG(TAG, "%"PRIu32"", accumulator);
#endif #endif
@ -560,11 +522,9 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
else else
{ {
CopyOffset = (HistoryBufferSize - 1) & (HistoryPtr - MatchPtr); CopyOffset = (HistoryBufferSize - 1) & (HistoryPtr - MatchPtr);
*HistoryPtr++ = Sym2; *HistoryPtr++ = Sym2;
*HistoryPtr++ = Sym3; *HistoryPtr++ = Sym3;
pSrcPtr += 2; pSrcPtr += 2;
LengthOfMatch = 3; LengthOfMatch = 3;
MatchPtr += 2; MatchPtr += 2;
@ -749,7 +709,6 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
} }
accumulator = *pSrcPtr; accumulator = *pSrcPtr;
#ifdef DEBUG_MPPC #ifdef DEBUG_MPPC
WLog_DBG(TAG, "%"PRIu32"", accumulator); WLog_DBG(TAG, "%"PRIu32"", accumulator);
#endif #endif
@ -770,7 +729,6 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
} }
BitStream_Flush(bs); BitStream_Flush(bs);
*pFlags |= PACKET_COMPRESSED; *pFlags |= PACKET_COMPRESSED;
*pFlags |= CompressionLevel; *pFlags |= CompressionLevel;
@ -781,10 +739,8 @@ int mppc_compress(MPPC_CONTEXT* mppc, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppD
*pFlags |= PACKET_FLUSHED; *pFlags |= PACKET_FLUSHED;
*pDstSize = ((bs->position + 7) / 8); *pDstSize = ((bs->position + 7) / 8);
mppc->HistoryPtr = HistoryPtr; mppc->HistoryPtr = HistoryPtr;
mppc->HistoryOffset = HistoryPtr - HistoryBuffer; mppc->HistoryOffset = HistoryPtr - HistoryBuffer;
return 1; return 1;
} }
@ -818,7 +774,6 @@ void mppc_context_reset(MPPC_CONTEXT* mppc, BOOL flush)
MPPC_CONTEXT* mppc_context_new(DWORD CompressionLevel, BOOL Compressor) MPPC_CONTEXT* mppc_context_new(DWORD CompressionLevel, BOOL Compressor)
{ {
MPPC_CONTEXT* mppc; MPPC_CONTEXT* mppc;
mppc = calloc(1, sizeof(MPPC_CONTEXT)); mppc = calloc(1, sizeof(MPPC_CONTEXT));
if (mppc) if (mppc)
@ -837,6 +792,7 @@ MPPC_CONTEXT* mppc_context_new(DWORD CompressionLevel, BOOL Compressor)
} }
mppc->bs = BitStream_New(); mppc->bs = BitStream_New();
if (!mppc->bs) if (!mppc->bs)
{ {
free(mppc); free(mppc);
@ -854,7 +810,6 @@ void mppc_context_free(MPPC_CONTEXT* mppc)
if (mppc) if (mppc)
{ {
BitStream_Free(mppc->bs); BitStream_Free(mppc->bs);
free(mppc); free(mppc);
} }
} }

26
libfreerdp/codec/planar.c
View File

@ -33,14 +33,14 @@
#define TAG FREERDP_TAG("codec") #define TAG FREERDP_TAG("codec")
static BYTE* freerdp_bitmap_planar_compress_plane_rle( static INLINE BYTE* freerdp_bitmap_planar_compress_plane_rle(
const BYTE* plane, UINT32 width, UINT32 height, const BYTE* plane, UINT32 width, UINT32 height,
BYTE* outPlane, UINT32* dstSize); BYTE* outPlane, UINT32* dstSize);
static BYTE* freerdp_bitmap_planar_delta_encode_plane( static INLINE BYTE* freerdp_bitmap_planar_delta_encode_plane(
const BYTE* inPlane, UINT32 width, UINT32 height, BYTE* outPlane); const BYTE* inPlane, UINT32 width, UINT32 height, BYTE* outPlane);
static INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize, static INLINE INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize,
UINT32 nWidth, UINT32 nHeight) UINT32 nWidth, UINT32 nHeight)
{ {
UINT32 x, y; UINT32 x, y;
int cRawBytes; int cRawBytes;
@ -88,7 +88,7 @@ static INT32 planar_skip_plane_rle(const BYTE* pSrcData, UINT32 SrcSize,
return (INT32)(pRLE - pSrcData); return (INT32)(pRLE - pSrcData);
} }
static INT32 planar_decompress_plane_rle(const BYTE* pSrcData, UINT32 SrcSize, static INLINE INT32 planar_decompress_plane_rle(const BYTE* pSrcData, UINT32 SrcSize,
BYTE* pDstData, INT32 nDstStep, BYTE* pDstData, INT32 nDstStep,
UINT32 nXDst, UINT32 nYDst, UINT32 nXDst, UINT32 nYDst,
UINT32 nWidth, UINT32 nHeight, UINT32 nWidth, UINT32 nHeight,
@ -223,7 +223,7 @@ static INT32 planar_decompress_plane_rle(const BYTE* pSrcData, UINT32 SrcSize,
return (INT32)(srcp - pSrcData); return (INT32)(srcp - pSrcData);
} }
static BOOL planar_decompress_planes_raw(const BYTE* pSrcData[4], static INLINE BOOL planar_decompress_planes_raw(const BYTE* pSrcData[4],
BYTE* pDstData, UINT32 DstFormat, BYTE* pDstData, UINT32 DstFormat,
UINT32 nDstStep, UINT32 nXDst, UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 nDstStep, UINT32 nXDst, UINT32 nYDst, UINT32 nWidth, UINT32 nHeight,
BOOL alpha, BOOL vFlip) BOOL alpha, BOOL vFlip)
@ -676,9 +676,9 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar,
return (SrcSize == (srcp - pSrcData)) ? TRUE : FALSE; return (SrcSize == (srcp - pSrcData)) ? TRUE : FALSE;
} }
static BOOL freerdp_split_color_planes(const BYTE* data, UINT32 format, static INLINE BOOL freerdp_split_color_planes(const BYTE* data, UINT32 format,
UINT32 width, UINT32 height, UINT32 width, UINT32 height,
UINT32 scanline, BYTE* planes[4]) UINT32 scanline, BYTE* planes[4])
{ {
INT32 i, j, k; INT32 i, j, k;
k = 0; k = 0;
@ -703,7 +703,7 @@ static BOOL freerdp_split_color_planes(const BYTE* data, UINT32 format,
return TRUE; return TRUE;
} }
static UINT32 freerdp_bitmap_planar_write_rle_bytes( static INLINE UINT32 freerdp_bitmap_planar_write_rle_bytes(
const BYTE* pInBuffer, UINT32 cRawBytes, UINT32 nRunLength, const BYTE* pInBuffer, UINT32 cRawBytes, UINT32 nRunLength,
BYTE* pOutBuffer, UINT32 outBufferSize) BYTE* pOutBuffer, UINT32 outBufferSize)
{ {
@ -817,7 +817,7 @@ static UINT32 freerdp_bitmap_planar_write_rle_bytes(
return (pOutput - pOutBuffer); return (pOutput - pOutBuffer);
} }
static UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* pInBuffer, static INLINE UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* pInBuffer,
UINT32 inBufferSize, UINT32 inBufferSize,
BYTE* pOutBuffer, BYTE* pOutBuffer,
UINT32 outBufferSize) UINT32 outBufferSize)
@ -955,7 +955,7 @@ BYTE* freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
return outPlane; return outPlane;
} }
static UINT32 freerdp_bitmap_planar_compress_planes_rle( static INLINE UINT32 freerdp_bitmap_planar_compress_planes_rle(
BYTE* inPlanes[4], UINT32 width, UINT32 height, BYTE* inPlanes[4], UINT32 width, UINT32 height,
BYTE* outPlanes, UINT32* dstSizes, BOOL skipAlpha) BYTE* outPlanes, UINT32* dstSizes, BOOL skipAlpha)
{ {
@ -1047,7 +1047,7 @@ BYTE* freerdp_bitmap_planar_delta_encode_plane(const BYTE* inPlane,
return outPlane; return outPlane;
} }
static BOOL freerdp_bitmap_planar_delta_encode_planes(BYTE* inPlanes[4], static INLINE BOOL freerdp_bitmap_planar_delta_encode_planes(BYTE* inPlanes[4],
UINT32 width, UINT32 height, UINT32 width, UINT32 height,
BYTE* outPlanes[4]) BYTE* outPlanes[4])
{ {

40
libfreerdp/core/bulk.c
View File

@ -27,7 +27,7 @@
//#define WITH_BULK_DEBUG 1 //#define WITH_BULK_DEBUG 1
const char* bulk_get_compression_flags_string(UINT32 flags) static INLINE const char* bulk_get_compression_flags_string(UINT32 flags)
{ {
flags &= BULK_COMPRESSION_FLAGS_MASK; flags &= BULK_COMPRESSION_FLAGS_MASK;
@ -55,7 +55,7 @@ UINT32 bulk_compression_level(rdpBulk* bulk)
{ {
rdpSettings* settings = bulk->context->settings; rdpSettings* settings = bulk->context->settings;
bulk->CompressionLevel = (settings->CompressionLevel >= PACKET_COMPR_TYPE_RDP61) ? bulk->CompressionLevel = (settings->CompressionLevel >= PACKET_COMPR_TYPE_RDP61) ?
PACKET_COMPR_TYPE_RDP61 : settings->CompressionLevel; PACKET_COMPR_TYPE_RDP61 : settings->CompressionLevel;
return bulk->CompressionLevel; return bulk->CompressionLevel;
} }
@ -66,7 +66,8 @@ UINT32 bulk_compression_max_size(rdpBulk* bulk)
return bulk->CompressionMaxSize; return bulk->CompressionMaxSize;
} }
int bulk_compress_validate(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) static INLINE int bulk_compress_validate(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize,
BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags)
{ {
int status; int status;
BYTE* _pSrcData = NULL; BYTE* _pSrcData = NULL;
@ -87,7 +88,8 @@ int bulk_compress_validate(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE**
if (_DstSize != SrcSize) if (_DstSize != SrcSize)
{ {
WLog_DBG(TAG, "compression/decompression size mismatch: Actual: %"PRIu32", Expected: %"PRIu32"", _DstSize, SrcSize); WLog_DBG(TAG, "compression/decompression size mismatch: Actual: %"PRIu32", Expected: %"PRIu32"",
_DstSize, SrcSize);
return -1; return -1;
} }
@ -106,7 +108,8 @@ int bulk_compress_validate(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE**
return status; return status;
} }
int bulk_decompress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32 flags) int bulk_decompress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData,
UINT32* pDstSize, UINT32 flags)
{ {
UINT32 type; UINT32 type;
int status = -1; int status = -1;
@ -159,11 +162,12 @@ int bulk_decompress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstD
CompressionRatio = metrics_write_bytes(metrics, UncompressedBytes, CompressedBytes); CompressionRatio = metrics_write_bytes(metrics, UncompressedBytes, CompressedBytes);
#ifdef WITH_BULK_DEBUG #ifdef WITH_BULK_DEBUG
{ {
WLog_DBG(TAG, "Decompress Type: %"PRIu32" Flags: %s (0x%08"PRIX32") Compression Ratio: %f (%"PRIu32" / %"PRIu32"), Total: %f (%"PRIu64" / %"PRIu64")", WLog_DBG(TAG,
type, bulk_get_compression_flags_string(flags), flags, "Decompress Type: %"PRIu32" Flags: %s (0x%08"PRIX32") Compression Ratio: %f (%"PRIu32" / %"PRIu32"), Total: %f (%"PRIu64" / %"PRIu64")",
CompressionRatio, CompressedBytes, UncompressedBytes, type, bulk_get_compression_flags_string(flags), flags,
metrics->TotalCompressionRatio, metrics->TotalCompressedBytes, CompressionRatio, CompressedBytes, UncompressedBytes,
metrics->TotalUncompressedBytes); metrics->TotalCompressionRatio, metrics->TotalCompressedBytes,
metrics->TotalUncompressedBytes);
} }
#endif #endif
} }
@ -175,7 +179,8 @@ int bulk_decompress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstD
return status; return status;
} }
int bulk_compress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize, UINT32* pFlags) int bulk_compress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstData, UINT32* pDstSize,
UINT32* pFlags)
{ {
int status = -1; int status = -1;
rdpMetrics* metrics; rdpMetrics* metrics;
@ -197,7 +202,7 @@ int bulk_compress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstDat
bulk_compression_max_size(bulk); bulk_compression_max_size(bulk);
if ((bulk->CompressionLevel == PACKET_COMPR_TYPE_8K) || if ((bulk->CompressionLevel == PACKET_COMPR_TYPE_8K) ||
(bulk->CompressionLevel == PACKET_COMPR_TYPE_64K)) (bulk->CompressionLevel == PACKET_COMPR_TYPE_64K))
{ {
mppc_set_compression_level(bulk->mppcSend, bulk->CompressionLevel); mppc_set_compression_level(bulk->mppcSend, bulk->CompressionLevel);
status = mppc_compress(bulk->mppcSend, pSrcData, SrcSize, ppDstData, pDstSize, pFlags); status = mppc_compress(bulk->mppcSend, pSrcData, SrcSize, ppDstData, pDstSize, pFlags);
@ -222,11 +227,12 @@ int bulk_compress(rdpBulk* bulk, BYTE* pSrcData, UINT32 SrcSize, BYTE** ppDstDat
CompressionRatio = metrics_write_bytes(metrics, UncompressedBytes, CompressedBytes); CompressionRatio = metrics_write_bytes(metrics, UncompressedBytes, CompressedBytes);
#ifdef WITH_BULK_DEBUG #ifdef WITH_BULK_DEBUG
{ {
WLog_DBG(TAG, "Compress Type: %"PRIu32" Flags: %s (0x%08"PRIX32") Compression Ratio: %f (%"PRIu32" / %"PRIu32"), Total: %f (%"PRIu64" / %"PRIu64")", WLog_DBG(TAG,
bulk->CompressionLevel, bulk_get_compression_flags_string(*pFlags), *pFlags, "Compress Type: %"PRIu32" Flags: %s (0x%08"PRIX32") Compression Ratio: %f (%"PRIu32" / %"PRIu32"), Total: %f (%"PRIu64" / %"PRIu64")",
CompressionRatio, CompressedBytes, UncompressedBytes, bulk->CompressionLevel, bulk_get_compression_flags_string(*pFlags), *pFlags,
metrics->TotalCompressionRatio, metrics->TotalCompressedBytes, CompressionRatio, CompressedBytes, UncompressedBytes,
metrics->TotalUncompressedBytes); metrics->TotalCompressionRatio, metrics->TotalCompressedBytes,
metrics->TotalUncompressedBytes);
} }
#endif #endif
} }