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

libwinpr-utils: move BitStream functions to macros

Browse Source
This commit is contained in:
Marc-André Moreau 2014-03-05 13:08:11 -05:00
parent 3ba1d1ff4e
commit dbe7e7aae2
3 changed files with 198 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
winpr/include/winpr/collections.h
View File

@ -610,6 +610,43 @@ struct _wBitStream
}; };
typedef struct _wBitStream wBitStream; typedef struct _wBitStream wBitStream;
#define BitStream_Attach(_bs, _buffer, _capacity) { \
_bs->position = 0; \
_bs->buffer = _buffer; \
_bs->offset = 0; \
_bs->accumulator = 0; \
_bs->pointer = _bs->buffer; \
_bs->capacity = _capacity; \
_bs->length = _bs->capacity; \
}
#define BitStream_Write_Bits(_bs, _bits, _nbits) { \
_bs->accumulator |= (_bits << _bs->offset); \
_bs->position += _nbits; \
_bs->offset += _nbits; \
if (_bs->offset >= 32) { \
*(_bs->pointer + 0) = (_bs->accumulator >> 0); \
*(_bs->pointer + 1) = (_bs->accumulator >> 8); \
*(_bs->pointer + 2) = (_bs->accumulator >> 16); \
*(_bs->pointer + 3) = (_bs->accumulator >> 24); \
_bs->offset = _bs->offset - 32; \
_bs->accumulator = _bits >> (_nbits - _bs->offset); \
_bs->pointer += 4; \
} \
}
#define BitStream_Flush(_bs) { \
*(_bs->pointer + 0) = (_bs->accumulator >> 0); \
*(_bs->pointer + 1) = (_bs->accumulator >> 8); \
*(_bs->pointer + 2) = (_bs->accumulator >> 16); \
*(_bs->pointer + 3) = (_bs->accumulator >> 24); \
}
#define BITDUMP_MSB_FIRST 0x00000001
#define BITDUMP_STDERR 0x00000002
WINPR_API void BitDump(BYTE* buffer, UINT32 length, UINT32 flags);
WINPR_API wBitStream* BitStream_New(); WINPR_API wBitStream* BitStream_New();
WINPR_API void BitStream_Free(wBitStream* bs); WINPR_API void BitStream_Free(wBitStream* bs);

157
winpr/libwinpr/utils/collections/BitStream.c
View File

@ -23,6 +23,163 @@
#include <winpr/collections.h> #include <winpr/collections.h>
const char* BYTE_BIT_STRINGS_LSB[256] =
{
"00000000", "00000001", "00000010", "00000011",
"00000100", "00000101", "00000110", "00000111",
"00001000", "00001001", "00001010", "00001011",
"00001100", "00001101", "00001110", "00001111",
"00010000", "00010001", "00010010", "00010011",
"00010100", "00010101", "00010110", "00010111",
"00011000", "00011001", "00011010", "00011011",
"00011100", "00011101", "00011110", "00011111",
"00100000", "00100001", "00100010", "00100011",
"00100100", "00100101", "00100110", "00100111",
"00101000", "00101001", "00101010", "00101011",
"00101100", "00101101", "00101110", "00101111",
"00110000", "00110001", "00110010", "00110011",
"00110100", "00110101", "00110110", "00110111",
"00111000", "00111001", "00111010", "00111011",
"00111100", "00111101", "00111110", "00111111",
"01000000", "01000001", "01000010", "01000011",
"01000100", "01000101", "01000110", "01000111",
"01001000", "01001001", "01001010", "01001011",
"01001100", "01001101", "01001110", "01001111",
"01010000", "01010001", "01010010", "01010011",
"01010100", "01010101", "01010110", "01010111",
"01011000", "01011001", "01011010", "01011011",
"01011100", "01011101", "01011110", "01011111",
"01100000", "01100001", "01100010", "01100011",
"01100100", "01100101", "01100110", "01100111",
"01101000", "01101001", "01101010", "01101011",
"01101100", "01101101", "01101110", "01101111",
"01110000", "01110001", "01110010", "01110011",
"01110100", "01110101", "01110110", "01110111",
"01111000", "01111001", "01111010", "01111011",
"01111100", "01111101", "01111110", "01111111",
"10000000", "10000001", "10000010", "10000011",
"10000100", "10000101", "10000110", "10000111",
"10001000", "10001001", "10001010", "10001011",
"10001100", "10001101", "10001110", "10001111",
"10010000", "10010001", "10010010", "10010011",
"10010100", "10010101", "10010110", "10010111",
"10011000", "10011001", "10011010", "10011011",
"10011100", "10011101", "10011110", "10011111",
"10100000", "10100001", "10100010", "10100011",
"10100100", "10100101", "10100110", "10100111",
"10101000", "10101001", "10101010", "10101011",
"10101100", "10101101", "10101110", "10101111",
"10110000", "10110001", "10110010", "10110011",
"10110100", "10110101", "10110110", "10110111",
"10111000", "10111001", "10111010", "10111011",
"10111100", "10111101", "10111110", "10111111",
"11000000", "11000001", "11000010", "11000011",
"11000100", "11000101", "11000110", "11000111",
"11001000", "11001001", "11001010", "11001011",
"11001100", "11001101", "11001110", "11001111",
"11010000", "11010001", "11010010", "11010011",
"11010100", "11010101", "11010110", "11010111",
"11011000", "11011001", "11011010", "11011011",
"11011100", "11011101", "11011110", "11011111",
"11100000", "11100001", "11100010", "11100011",
"11100100", "11100101", "11100110", "11100111",
"11101000", "11101001", "11101010", "11101011",
"11101100", "11101101", "11101110", "11101111",
"11110000", "11110001", "11110010", "11110011",
"11110100", "11110101", "11110110", "11110111",
"11111000", "11111001", "11111010", "11111011",
"11111100", "11111101", "11111110", "11111111"
};
const char* BYTE_BIT_STRINGS_MSB[256] =
{
"00000000", "10000000", "01000000", "11000000",
"00100000", "10100000", "01100000", "11100000",
"00010000", "10010000", "01010000", "11010000",
"00110000", "10110000", "01110000", "11110000",
"00001000", "10001000", "01001000", "11001000",
"00101000", "10101000", "01101000", "11101000",
"00011000", "10011000", "01011000", "11011000",
"00111000", "10111000", "01111000", "11111000",
"00000100", "10000100", "01000100", "11000100",
"00100100", "10100100", "01100100", "11100100",
"00010100", "10010100", "01010100", "11010100",
"00110100", "10110100", "01110100", "11110100",
"00001100", "10001100", "01001100", "11001100",
"00101100", "10101100", "01101100", "11101100",
"00011100", "10011100", "01011100", "11011100",
"00111100", "10111100", "01111100", "11111100",
"00000010", "10000010", "01000010", "11000010",
"00100010", "10100010", "01100010", "11100010",
"00010010", "10010010", "01010010", "11010010",
"00110010", "10110010", "01110010", "11110010",
"00001010", "10001010", "01001010", "11001010",
"00101010", "10101010", "01101010", "11101010",
"00011010", "10011010", "01011010", "11011010",
"00111010", "10111010", "01111010", "11111010",
"00000110", "10000110", "01000110", "11000110",
"00100110", "10100110", "01100110", "11100110",
"00010110", "10010110", "01010110", "11010110",
"00110110", "10110110", "01110110", "11110110",
"00001110", "10001110", "01001110", "11001110",
"00101110", "10101110", "01101110", "11101110",
"00011110", "10011110", "01011110", "11011110",
"00111110", "10111110", "01111110", "11111110",
"00000001", "10000001", "01000001", "11000001",
"00100001", "10100001", "01100001", "11100001",
"00010001", "10010001", "01010001", "11010001",
"00110001", "10110001", "01110001", "11110001",
"00001001", "10001001", "01001001", "11001001",
"00101001", "10101001", "01101001", "11101001",
"00011001", "10011001", "01011001", "11011001",
"00111001", "10111001", "01111001", "11111001",
"00000101", "10000101", "01000101", "11000101",
"00100101", "10100101", "01100101", "11100101",
"00010101", "10010101", "01010101", "11010101",
"00110101", "10110101", "01110101", "11110101",
"00001101", "10001101", "01001101", "11001101",
"00101101", "10101101", "01101101", "11101101",
"00011101", "10011101", "01011101", "11011101",
"00111101", "10111101", "01111101", "11111101",
"00000011", "10000011", "01000011", "11000011",
"00100011", "10100011", "01100011", "11100011",
"00010011", "10010011", "01010011", "11010011",
"00110011", "10110011", "01110011", "11110011",
"00001011", "10001011", "01001011", "11001011",
"00101011", "10101011", "01101011", "11101011",
"00011011", "10011011", "01011011", "11011011",
"00111011", "10111011", "01111011", "11111011",
"00000111", "10000111", "01000111", "11000111",
"00100111", "10100111", "01100111", "11100111",
"00010111", "10010111", "01010111", "11010111",
"00110111", "10110111", "01110111", "11110111",
"00001111", "10001111", "01001111", "11001111",
"00101111", "10101111", "01101111", "11101111",
"00011111", "10011111", "01011111", "11011111",
"00111111", "10111111", "01111111", "11111111"
};
void BitDump(BYTE* buffer, UINT32 length, UINT32 flags)
{
DWORD i;
int nbits;
const char* str;
const char** strs;
strs = (flags & BITDUMP_MSB_FIRST) ? BYTE_BIT_STRINGS_MSB : BYTE_BIT_STRINGS_LSB;
for (i = 0; i < length; i += 8)
{
str = strs[buffer[i / 8]];
nbits = (length - i) > 8 ? 8 : (length - i);
printf("%.*s ", nbits, str);
}
printf("\n");
}
wBitStream* BitStream_New() wBitStream* BitStream_New()
{ {
wBitStream* bs = NULL; wBitStream* bs = NULL;

205
winpr/libwinpr/utils/test/TestBitStream.c
View File

@ -4,142 +4,6 @@
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/collections.h> #include <winpr/collections.h>
const char* BYTE_BIT_STRINGS_LSB[256] =
{
"00000000", "00000001", "00000010", "00000011",
"00000100", "00000101", "00000110", "00000111",
"00001000", "00001001", "00001010", "00001011",
"00001100", "00001101", "00001110", "00001111",
"00010000", "00010001", "00010010", "00010011",
"00010100", "00010101", "00010110", "00010111",
"00011000", "00011001", "00011010", "00011011",
"00011100", "00011101", "00011110", "00011111",
"00100000", "00100001", "00100010", "00100011",
"00100100", "00100101", "00100110", "00100111",
"00101000", "00101001", "00101010", "00101011",
"00101100", "00101101", "00101110", "00101111",
"00110000", "00110001", "00110010", "00110011",
"00110100", "00110101", "00110110", "00110111",
"00111000", "00111001", "00111010", "00111011",
"00111100", "00111101", "00111110", "00111111",
"01000000", "01000001", "01000010", "01000011",
"01000100", "01000101", "01000110", "01000111",
"01001000", "01001001", "01001010", "01001011",
"01001100", "01001101", "01001110", "01001111",
"01010000", "01010001", "01010010", "01010011",
"01010100", "01010101", "01010110", "01010111",
"01011000", "01011001", "01011010", "01011011",
"01011100", "01011101", "01011110", "01011111",
"01100000", "01100001", "01100010", "01100011",
"01100100", "01100101", "01100110", "01100111",
"01101000", "01101001", "01101010", "01101011",
"01101100", "01101101", "01101110", "01101111",
"01110000", "01110001", "01110010", "01110011",
"01110100", "01110101", "01110110", "01110111",
"01111000", "01111001", "01111010", "01111011",
"01111100", "01111101", "01111110", "01111111",
"10000000", "10000001", "10000010", "10000011",
"10000100", "10000101", "10000110", "10000111",
"10001000", "10001001", "10001010", "10001011",
"10001100", "10001101", "10001110", "10001111",
"10010000", "10010001", "10010010", "10010011",
"10010100", "10010101", "10010110", "10010111",
"10011000", "10011001", "10011010", "10011011",
"10011100", "10011101", "10011110", "10011111",
"10100000", "10100001", "10100010", "10100011",
"10100100", "10100101", "10100110", "10100111",
"10101000", "10101001", "10101010", "10101011",
"10101100", "10101101", "10101110", "10101111",
"10110000", "10110001", "10110010", "10110011",
"10110100", "10110101", "10110110", "10110111",
"10111000", "10111001", "10111010", "10111011",
"10111100", "10111101", "10111110", "10111111",
"11000000", "11000001", "11000010", "11000011",
"11000100", "11000101", "11000110", "11000111",
"11001000", "11001001", "11001010", "11001011",
"11001100", "11001101", "11001110", "11001111",
"11010000", "11010001", "11010010", "11010011",
"11010100", "11010101", "11010110", "11010111",
"11011000", "11011001", "11011010", "11011011",
"11011100", "11011101", "11011110", "11011111",
"11100000", "11100001", "11100010", "11100011",
"11100100", "11100101", "11100110", "11100111",
"11101000", "11101001", "11101010", "11101011",
"11101100", "11101101", "11101110", "11101111",
"11110000", "11110001", "11110010", "11110011",
"11110100", "11110101", "11110110", "11110111",
"11111000", "11111001", "11111010", "11111011",
"11111100", "11111101", "11111110", "11111111"
};
const char* BYTE_BIT_STRINGS_MSB[256] =
{
"00000000", "10000000", "01000000", "11000000",
"00100000", "10100000", "01100000", "11100000",
"00010000", "10010000", "01010000", "11010000",
"00110000", "10110000", "01110000", "11110000",
"00001000", "10001000", "01001000", "11001000",
"00101000", "10101000", "01101000", "11101000",
"00011000", "10011000", "01011000", "11011000",
"00111000", "10111000", "01111000", "11111000",
"00000100", "10000100", "01000100", "11000100",
"00100100", "10100100", "01100100", "11100100",
"00010100", "10010100", "01010100", "11010100",
"00110100", "10110100", "01110100", "11110100",
"00001100", "10001100", "01001100", "11001100",
"00101100", "10101100", "01101100", "11101100",
"00011100", "10011100", "01011100", "11011100",
"00111100", "10111100", "01111100", "11111100",
"00000010", "10000010", "01000010", "11000010",
"00100010", "10100010", "01100010", "11100010",
"00010010", "10010010", "01010010", "11010010",
"00110010", "10110010", "01110010", "11110010",
"00001010", "10001010", "01001010", "11001010",
"00101010", "10101010", "01101010", "11101010",
"00011010", "10011010", "01011010", "11011010",
"00111010", "10111010", "01111010", "11111010",
"00000110", "10000110", "01000110", "11000110",
"00100110", "10100110", "01100110", "11100110",
"00010110", "10010110", "01010110", "11010110",
"00110110", "10110110", "01110110", "11110110",
"00001110", "10001110", "01001110", "11001110",
"00101110", "10101110", "01101110", "11101110",
"00011110", "10011110", "01011110", "11011110",
"00111110", "10111110", "01111110", "11111110",
"00000001", "10000001", "01000001", "11000001",
"00100001", "10100001", "01100001", "11100001",
"00010001", "10010001", "01010001", "11010001",
"00110001", "10110001", "01110001", "11110001",
"00001001", "10001001", "01001001", "11001001",
"00101001", "10101001", "01101001", "11101001",
"00011001", "10011001", "01011001", "11011001",
"00111001", "10111001", "01111001", "11111001",
"00000101", "10000101", "01000101", "11000101",
"00100101", "10100101", "01100101", "11100101",
"00010101", "10010101", "01010101", "11010101",
"00110101", "10110101", "01110101", "11110101",
"00001101", "10001101", "01001101", "11001101",
"00101101", "10101101", "01101101", "11101101",
"00011101", "10011101", "01011101", "11011101",
"00111101", "10111101", "01111101", "11111101",
"00000011", "10000011", "01000011", "11000011",
"00100011", "10100011", "01100011", "11100011",
"00010011", "10010011", "01010011", "11010011",
"00110011", "10110011", "01110011", "11110011",
"00001011", "10001011", "01001011", "11001011",
"00101011", "10101011", "01101011", "11101011",
"00011011", "10011011", "01011011", "11011011",
"00111011", "10111011", "01111011", "11111011",
"00000111", "10000111", "01000111", "11000111",
"00100111", "10100111", "01100111", "11100111",
"00010111", "10010111", "01010111", "11010111",
"00110111", "10110111", "01110111", "11110111",
"00001111", "10001111", "01001111", "11001111",
"00101111", "10101111", "01101111", "11101111",
"00011111", "10011111", "01011111", "11011111",
"00111111", "10111111", "01111111", "11111111"
};
void BitStrGen() void BitStrGen()
{ {
DWORD i, j; DWORD i, j;
@ -189,67 +53,6 @@ void BitStrGen()
} }
} }
void BitDump(BYTE* buffer, DWORD length, BOOL msbFirst)
{
DWORD i;
int nbits;
const char* str;
const char** strs;
strs = msbFirst ? BYTE_BIT_STRINGS_MSB : BYTE_BIT_STRINGS_LSB;
for (i = 0; i < length; i += 8)
{
str = strs[buffer[i / 8]];
nbits = (length - i) > 8 ? 8 : (length - i);
printf("%.*s ", nbits, str);
}
printf("\n");
}
void BitStream_Attach(wBitStream* bs, BYTE* buffer, DWORD capacity)
{
bs->position = 0;
bs->buffer = buffer;
bs->offset = 0;
bs->accumulator = 0;
bs->pointer = bs->buffer;
bs->capacity = capacity;
bs->length = bs->capacity;
}
void BitStream_Flush(wBitStream* bs)
{
*(bs->pointer + 0) = (bs->accumulator >> 0);
*(bs->pointer + 1) = (bs->accumulator >> 8);
*(bs->pointer + 2) = (bs->accumulator >> 16);
*(bs->pointer + 3) = (bs->accumulator >> 24);
}
void BitStream_Write_Bits(wBitStream* bs, UINT32 bits, UINT32 nbits)
{
bs->accumulator |= (bits << bs->offset);
bs->position += nbits;
bs->offset += nbits;
if (bs->offset >= 32)
{
*(bs->pointer + 0) = (bs->accumulator >> 0);
*(bs->pointer + 1) = (bs->accumulator >> 8);
*(bs->pointer + 2) = (bs->accumulator >> 16);
*(bs->pointer + 3) = (bs->accumulator >> 24);
bs->offset = bs->offset - 32;
bs->accumulator = bits >> (nbits - bs->offset);
bs->pointer += 4;
}
}
int TestBitStream(int argc, char* argv[]) int TestBitStream(int argc, char* argv[])
{ {
wBitStream* bs; wBitStream* bs;
@ -266,7 +69,7 @@ int TestBitStream(int argc, char* argv[])
BitStream_Write_Bits(bs, 0xA, 4); /* 0101 */ BitStream_Write_Bits(bs, 0xA, 4); /* 0101 */
BitStream_Flush(bs); BitStream_Flush(bs);
BitDump(buffer, bs->position, TRUE); BitDump(buffer, bs->position, BITDUMP_MSB_FIRST);
BitStream_Write_Bits(bs, 3, 2); /* 11 */ BitStream_Write_Bits(bs, 3, 2); /* 11 */
BitStream_Write_Bits(bs, 0, 3); /* 000 */ BitStream_Write_Bits(bs, 0, 3); /* 000 */
@ -274,12 +77,12 @@ int TestBitStream(int argc, char* argv[])
BitStream_Write_Bits(bs, 0x19, 5); /* 11001 */ BitStream_Write_Bits(bs, 0x19, 5); /* 11001 */
//BitStream_Flush(bs); /* flush should be done automatically here (32 bits written) */ //BitStream_Flush(bs); /* flush should be done automatically here (32 bits written) */
BitDump(buffer, bs->position, TRUE); BitDump(buffer, bs->position, BITDUMP_MSB_FIRST);
BitStream_Write_Bits(bs, 3, 2); /* 11 */ BitStream_Write_Bits(bs, 3, 2); /* 11 */
BitStream_Flush(bs); BitStream_Flush(bs);
BitDump(buffer, bs->position, TRUE); BitDump(buffer, bs->position, BITDUMP_MSB_FIRST);
BitStream_Write_Bits(bs, 00, 2); /* 00 */ BitStream_Write_Bits(bs, 00, 2); /* 00 */
BitStream_Write_Bits(bs, 0xF, 4); /* 1111 */ BitStream_Write_Bits(bs, 0xF, 4); /* 1111 */
@ -288,7 +91,7 @@ int TestBitStream(int argc, char* argv[])
BitStream_Write_Bits(bs, 0xAFF, 12); /* 111111110101 */ BitStream_Write_Bits(bs, 0xAFF, 12); /* 111111110101 */
BitStream_Flush(bs); BitStream_Flush(bs);
BitDump(buffer, bs->position, TRUE); BitDump(buffer, bs->position, BITDUMP_MSB_FIRST);
BitStream_Free(bs); BitStream_Free(bs);