Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some improvements i made when i read src codes #29

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

some improvements i made when i read src codes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3b2ae5
Improve BitStream::WriteCompressed(uint24_t)
Nov 14, 2015
22c0513
Revert "Improve BitStream::WriteCompressed(uint24_t)"
Nov 14, 2015
beb10e2
Improve Write and Read uint24_t By Compressed
Nov 14, 2015
7007ec6
Improve WriteCompressed() and ReadCompressed()
Nov 14, 2015
0df7936
UP.
Nov 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 91 additions & 36 deletions Source/BitStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,10 @@ void BitStream::SetData( unsigned char *inByteArray )
void BitStream::WriteCompressed( const unsigned char* inByteArray,
const unsigned int size, const bool unsignedData )
{
BitSize_t currentByte = ( size >> 3 ) - 1; // PCs
static bool truee = true;
static bool falsee = false;

BitSize_t currentByte;

unsigned char byteMatch;

Expand All @@ -505,27 +508,61 @@ void BitStream::WriteCompressed( const unsigned char* inByteArray,

// Write upper bytes with a single 1
// From high byte to low byte, if high byte is a byteMatch then write a 1 bit. Otherwise write a 0 bit and then write the remaining bytes
while ( currentByte > 0 )
if (!IsBigEndian())
{
if ( inByteArray[ currentByte ] == byteMatch ) // If high byte is byteMatch (0 of 0xff) then it would have the same value shifted
/// get the highest byte with highest index PCs
currentByte = (size >> 3) - 1;

/// From high byte to low byte,
/// if high byte is a byteMatch then write a 1 bit.
/// Otherwise write a 0 bit and then write the remaining bytes
while (currentByte > 0)
{
bool b = true;
Write( b );
/// If high byte is byteMatch (0 or 0xff)
/// then it would have the same value shifted
if (inByteArray[currentByte] == byteMatch)
{
Write(truee);
currentByte--;
}
else /// the first byte is not matched
{
Write(falsee);
// Write the remainder of the data after writing bit false
WriteBits(inByteArray, (currentByte + 1) << 3, true);
return;
}
}
else
{
// Write the remainder of the data after writing 0
bool b = false;
Write( b );

WriteBits( inByteArray, ( currentByte + 1 ) << 3, true );
// currentByte--;

/// make sure we are now on the lowest byte (index 0)
RakAssert(currentByte == 0);
}
else
{
/// get the highest byte with highest index PCs
currentByte = 0;

return ;
/// From high byte to low byte,
/// if high byte is a byteMatch then write a 1 bit.
/// Otherwise write a 0 bit and then write the remaining bytes
while (currentByte < ((size >> 3) - 1))
{
/// If high byte is byteMatch (0 or 0xff)
/// then it would have the same value shifted
if (inByteArray[currentByte] == byteMatch)
{
Write(truee);
currentByte++;
}
else /// the first byte is not matched
{
Write(falsee);
// Write the remainder of the data after writing bit false
WriteBits(inByteArray + currentByte, size - (currentByte << 3), true);
return;
}
}

currentByte--;
/// make sure we are now on the lowest byte (index highest)
RakAssert(currentByte == ((size >> 3) - 1));
}

// If the upper half of the last byte is a 0 (positive) or 16 (negative) then write a 1 and the remaining 4 bits. Otherwise write a 0 and the 8 bites.
Expand Down Expand Up @@ -617,7 +654,7 @@ bool BitStream::ReadBits( unsigned char *inOutByteArray, BitSize_t numberOfBitsT
bool BitStream::ReadCompressed( unsigned char* inOutByteArray,
const unsigned int size, const bool unsignedData )
{
unsigned int currentByte = ( size >> 3 ) - 1;
unsigned int currentByte;


unsigned char byteMatch, halfByteMatch;
Expand All @@ -636,28 +673,46 @@ bool BitStream::ReadCompressed( unsigned char* inOutByteArray,

// Upper bytes are specified with a single 1 if they match byteMatch
// From high byte to low byte, if high byte is a byteMatch then write a 1 bit. Otherwise write a 0 bit and then write the remaining bytes
while ( currentByte > 0 )
if (!IsBigEndian())
{
// If we read a 1 then the data is byteMatch.

bool b;

if ( Read( b ) == false )
return false;

if ( b ) // Check that bit
currentByte = (size >> 3) - 1;
while (currentByte > 0)
{
inOutByteArray[ currentByte ] = byteMatch;
currentByte--;
// If we read a 1 then the data is byteMatch.
bool b;
Read(b);
if (b) // Check that bit
{
data[currentByte] = byteMatch;
currentByte--;
}
else /// the first byte is not matched
{
// Read the rest of the bytes
ReadBits(data, (currentByte + 1) << 3);
return true;
}
}
else
}
else
{
currentByte = 0;
while (currentByte < ((size >> 3) - 1))
{
// Read the rest of the bytes

if ( ReadBits( inOutByteArray, ( currentByte + 1 ) << 3 ) == false )
return false;

return true;
// If we read a 1 then the data is byteMatch.
bool b;
Read(b);
if (b) // Check that bit
{
data[currentByte] = byteMatch;
currentByte++;
}
else /// the first byte is not matched
{
// Read the rest of the bytes
ReadBits(data, size - (currentByte << 3));
return true;
}
}
}

Expand Down
41 changes: 3 additions & 38 deletions Source/BitStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,25 +1278,8 @@ namespace RakNet
#ifdef _MSC_VER
#pragma warning(disable:4127) // conditional expression is constant
#endif
if (sizeof(inTemplateVar)==1)
WriteCompressed( ( unsigned char* ) & inTemplateVar, sizeof( templateType ) * 8, true );
else
{
#ifndef __BITSTREAM_NATIVE_END
#ifdef _MSC_VER
#pragma warning(disable:4244) // '=' : conversion from 'unsigned long' to 'unsigned short', possible loss of data
#endif

if (DoEndianSwap())
{
unsigned char output[sizeof(templateType)];
ReverseBytes((unsigned char*)&inTemplateVar, output, sizeof(templateType));
WriteCompressed( ( unsigned char* ) output, sizeof(templateType) * 8, true );
}
else
#endif
WriteCompressed( ( unsigned char* ) & inTemplateVar, sizeof(templateType) * 8, true );
}
}

template <>
Expand All @@ -1314,7 +1297,7 @@ namespace RakNet
template <>
inline void BitStream::WriteCompressed(const uint24_t &var)
{
Write(var);
WriteCompressed(var.val);
}

template <>
Expand Down Expand Up @@ -1616,25 +1599,7 @@ namespace RakNet
#ifdef _MSC_VER
#pragma warning(disable:4127) // conditional expression is constant
#endif
if (sizeof(outTemplateVar)==1)
return ReadCompressed( ( unsigned char* ) &outTemplateVar, sizeof(templateType) * 8, true );
else
{
#ifndef __BITSTREAM_NATIVE_END
if (DoEndianSwap())
{
unsigned char output[sizeof(templateType)];
if (ReadCompressed( ( unsigned char* ) output, sizeof(templateType) * 8, true ))
{
ReverseBytes(output, (unsigned char*)&outTemplateVar, sizeof(templateType));
return true;
}
return false;
}
else
#endif
return ReadCompressed( ( unsigned char* ) & outTemplateVar, sizeof(templateType) * 8, true );
}
return ReadCompressed((unsigned char*)&outTemplateVar, sizeof(templateType) * 8, true);
}

template <>
Expand All @@ -1646,7 +1611,7 @@ namespace RakNet
template <>
inline bool BitStream::ReadCompressed(uint24_t &outTemplateVar)
{
return Read(outTemplateVar);
return ReadCompressed(outTemplateVar.val);
}

template <>
Expand Down