R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more bitbuf inlines

Browse Source 
Added:
- Tell()
- GetNumBitsLeft()
- GetNumBytesLeft()
This commit is contained in:
Kawe Mazidjatari 2023-08-21 16:14:54 +02:00
parent 0066b82da7
commit 8c87ad219f
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
r5dev/public/tier1/bitbuf.h
View File

@ -127,14 +127,19 @@ public:
}
void StartReading(const void* pData, size_t nBytes, int64 iStartBit = 0, int64 nBits = -1);
bool Seek(int64 nPosition);
FORCEINLINE int64 Tell(void) const;
void GrabNextDWord(bool bOverFlowImmediately = false);
void FetchNext();
int64 GetNumBitsRead(void) const;
FORCEINLINE int64 GetNumBitsRead(void) const { return Tell(); };
FORCEINLINE int64 GetNumBytesRead(void) const { return ((GetNumBitsRead() + 7) >> 3); }
FORCEINLINE int64 GetNumBitsLeft() const { return m_nDataBits - GetNumBitsRead(); }
FORCEINLINE int64 GetNumBytesLeft() const { return GetNumBitsLeft() >> 3; }
int ReadSBitLong(int numbits);
uint32 ReadUBitLong(int numbits);
@ -240,4 +245,19 @@ public:
};
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
FORCEINLINE int64 CBitRead::Tell(void) const
{
if (!m_pData) // pesky null ptr bitbufs. these happen.
return 0;
int64 nCurOfs = int64(((intp(m_pDataIn) - intp(m_pData)) / 4) - 1);
nCurOfs *= 32;
nCurOfs += (32 - m_nBitsAvail);
int64 nAdjust = 8 * (m_nDataBytes & 3);
return MIN(nCurOfs + nAdjust, m_nDataBits);
}
#endif // BITBUF_H

15
r5dev/tier1/bitbuf.cpp
View File

@ -205,21 +205,6 @@ void CBitRead::FetchNext()
GrabNextDWord(false);
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
int64 CBitRead::GetNumBitsRead(void) const
{
if (!m_pData) // pesky null ptr bitbufs. these happen.
return 0;
int64 nCurOfs = int64(((intp(m_pDataIn) - intp(m_pData)) / 4) - 1);
nCurOfs *= 32;
nCurOfs += (32 - m_nBitsAvail);
int64 nAdjust = 8 * (m_nDataBytes & 3);
return MIN(nCurOfs + nAdjust, m_nDataBits);
}
//-----------------------------------------------------------------------------
// Purpose: reads an unsigned integer from the buffer
//-----------------------------------------------------------------------------