Removed unneeded files.

This commit is contained in:
n-a-c-h
2004-11-21 01:17:44 +00:00
parent b5d70d6aa1
commit 1aa2f0e542
9 changed files with 131 additions and 460 deletions

View File

@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define __COMPRESSION_RANGECODER_H
#include "inbyte.h"
#include "outbyte.h"
namespace NCompression {
namespace NArithmetic {
@@ -29,112 +28,6 @@ namespace NArithmetic {
const UINT32 kNumTopBits = 24;
const UINT32 kTopValue = (1 << kNumTopBits);
class CRangeEncoder
{
NStream::COutByte m_Stream;
UINT64 m_Low;
UINT32 m_Range;
UINT32 m_FFNum;
BYTE m_Cache;
public:
void Init(ISequentialOutStream *aStream)
{
m_Stream.Init(aStream);
m_Low = 0;
m_Range = UINT32(-1);
m_FFNum = 0;
m_Cache = 0;
}
void FlushData()
{
// m_Low += 1;
for(int i = 0; i < 5; i++)
ShiftLow();
}
HRESULT FlushStream()
{ return m_Stream.Flush(); }
void Encode(UINT32 aStart, UINT32 aSize, UINT32 aTotal)
{
m_Low += aStart * (m_Range /= aTotal);
m_Range *= aSize;
while (m_Range < kTopValue)
{
m_Range <<= 8;
ShiftLow();
}
}
/*
void EncodeDirectBitsDiv(UINT32 aValue, UINT32 aNumTotalBits)
{
m_Low += aValue * (m_Range >>= aNumTotalBits);
Normalize();
}
void EncodeDirectBitsDiv2(UINT32 aValue, UINT32 aNumTotalBits)
{
if (aNumTotalBits <= kNumBottomBits)
EncodeDirectBitsDiv(aValue, aNumTotalBits);
else
{
EncodeDirectBitsDiv(aValue >> kNumBottomBits, (aNumTotalBits - kNumBottomBits));
EncodeDirectBitsDiv(aValue & ((1 << kBottomValueBits) - 1), kNumBottomBits);
}
}
*/
void ShiftLow()
{
if (m_Low < (UINT32)0xFF000000 || UINT32(m_Low >> 32) == 1)
{
m_Stream.WriteByte(m_Cache + BYTE(m_Low >> 32));
for (;m_FFNum != 0; m_FFNum--)
m_Stream.WriteByte(0xFF + BYTE(m_Low >> 32));
m_Cache = BYTE(UINT32(m_Low) >> 24);
}
else
m_FFNum++;
m_Low = UINT32(m_Low) << 8;
}
void EncodeDirectBits(UINT32 aValue, UINT32 aNumTotalBits)
{
for (int i = aNumTotalBits - 1; i >= 0; i--)
{
m_Range >>= 1;
if (((aValue >> i) & 1) == 1)
m_Low += m_Range;
if (m_Range < kTopValue)
{
m_Range <<= 8;
ShiftLow();
}
}
}
void EncodeBit(UINT32 aSize0, UINT32 aNumTotalBits, UINT32 aSymbol)
{
UINT32 aNewBound = (m_Range >> aNumTotalBits) * aSize0;
if (aSymbol == 0)
m_Range = aNewBound;
else
{
m_Low += aNewBound;
m_Range -= aNewBound;
}
while (m_Range < kTopValue)
{
m_Range <<= 8;
ShiftLow();
}
}
UINT64 GetProcessedSize() { return m_Stream.GetProcessedSize() + m_FFNum; }
};
class CRangeDecoder
{
public: