diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-12-12 23:26:24 +0100 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-12-12 23:52:19 +0100 |
| commit | 39986e653def9d1130235c1cd6a38c3251bb6d79 (patch) | |
| tree | 0d84f0c219a8784d6ab22c74face2be230fd939a /src/atrac/atrac1_dequantiser.cpp | |
| parent | 2ca3d7fb3cfdc0b311bb20426d53782910dee64e (diff) | |
| download | atracdenc-39986e653def9d1130235c1cd6a38c3251bb6d79.tar.gz | |
[refactoring] Get rid of inheritance from data.
Diffstat (limited to 'src/atrac/atrac1_dequantiser.cpp')
| -rw-r--r-- | src/atrac/atrac1_dequantiser.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/atrac/atrac1_dequantiser.cpp b/src/atrac/atrac1_dequantiser.cpp index a259f42..0b1c065 100644 --- a/src/atrac/atrac1_dequantiser.cpp +++ b/src/atrac/atrac1_dequantiser.cpp @@ -27,9 +27,9 @@ TAtrac1Dequantiser::TAtrac1Dequantiser() { } void TAtrac1Dequantiser::Dequant(TBitStream* stream, const TBlockSize& bs, TFloat specs[512]) { - uint32_t wordLens[MaxBfus]; - uint32_t idScaleFactors[MaxBfus]; - const uint32_t numBFUs = BfuAmountTab[stream->Read(3)]; + uint32_t wordLens[TAtrac1Data::MaxBfus]; + uint32_t idScaleFactors[TAtrac1Data::MaxBfus]; + const uint32_t numBFUs = TAtrac1Data::BfuAmountTab[stream->Read(3)]; stream->Read(2); stream->Read(3); @@ -40,16 +40,17 @@ void TAtrac1Dequantiser::Dequant(TBitStream* stream, const TBlockSize& bs, TFloa for (uint32_t i = 0; i < numBFUs; i++) { idScaleFactors[i] = stream->Read(6); } - for (uint32_t i = numBFUs; i < MaxBfus; i++) { + for (uint32_t i = numBFUs; i < TAtrac1Data::MaxBfus; i++) { wordLens[i] = idScaleFactors[i] = 0; } - for (uint32_t bandNum = 0; bandNum < NumQMF; bandNum++) { - for (uint32_t bfuNum = BlocksPerBand[bandNum]; bfuNum < BlocksPerBand[bandNum + 1]; bfuNum++) { - const uint32_t numSpecs = SpecsPerBlock[bfuNum]; + for (uint32_t bandNum = 0; bandNum < TAtrac1Data::NumQMF; bandNum++) { + for (uint32_t bfuNum = TAtrac1Data::BlocksPerBand[bandNum]; bfuNum < TAtrac1Data::BlocksPerBand[bandNum + 1]; bfuNum++) { + const uint32_t numSpecs = TAtrac1Data::SpecsPerBlock[bfuNum]; const uint32_t wordLen = !!wordLens[bfuNum] + wordLens[bfuNum]; - const TFloat scaleFactor = ScaleTable[idScaleFactors[bfuNum]]; - const uint32_t startPos = bs.LogCount[bandNum] ? SpecsStartShort[bfuNum] : SpecsStartLong[bfuNum]; + const TFloat scaleFactor = TAtrac1Data::ScaleTable[idScaleFactors[bfuNum]]; + const uint32_t startPos = bs.LogCount[bandNum] ? + TAtrac1Data::SpecsStartShort[bfuNum] : TAtrac1Data::SpecsStartLong[bfuNum]; if (wordLen) { TFloat maxQuant = 1.0 / (TFloat)((1 << (wordLen - 1)) - 1); //cout << "BFU ("<< bfuNum << ") :" << "wordLen " << wordLen << " maxQuant " << maxQuant << " scaleFactor " << scaleFactor << " id " << idScaleFactors[bfuNum] << " num Specs " << numSpecs << " short: "<< (int)bs.LogCount[bandNum] << endl; @@ -61,7 +62,7 @@ void TAtrac1Dequantiser::Dequant(TBitStream* stream, const TBlockSize& bs, TFloa } } - } + } } } //namespace NAtrac1 |