aboutsummaryrefslogtreecommitdiffstats
path: root/src/atrac/atrac1_bitalloc.cpp
diff options
context:
space:
mode:
authorDaniil Cherednik <dan.cherednik@gmail.com>2025-01-25 23:50:51 +0000
committerDaniil Cherednik <dan.cherednik@gmail.com>2025-01-25 23:50:51 +0000
commit0696e23b2beef4a5525acd5a7013c7d1f3fd2f8e (patch)
treeae164a3e91a60eb51216239c6aeacc57accb39de /src/atrac/atrac1_bitalloc.cpp
parent7733e7f22330dacb315c0df003446fbe9c22d6ba (diff)
parent0fe8e1a0d1a495e41a281f54af31d6713c0de01d (diff)
downloadatracdenc-at3plus-dev.tar.gz
Merge branch 'master' into at3plus-devat3plus-dev
Diffstat (limited to 'src/atrac/atrac1_bitalloc.cpp')
-rw-r--r--src/atrac/atrac1_bitalloc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/atrac/atrac1_bitalloc.cpp b/src/atrac/atrac1_bitalloc.cpp
index 5b20cc8..f40ebe2 100644
--- a/src/atrac/atrac1_bitalloc.cpp
+++ b/src/atrac/atrac1_bitalloc.cpp
@@ -127,7 +127,7 @@ vector<uint32_t> TAtrac1SimpleBitAlloc::CalcBitsAllocation(const std::vector<TSc
const uint32_t bfuNum,
const float spread,
const float shift,
- const TBlockSize& blockSize,
+ const TAtrac1Data::TBlockSizeMod& blockSize,
const float loudness) {
vector<uint32_t> bitsPerEachBlock(bfuNum);
for (size_t i = 0; i < bitsPerEachBlock.size(); ++i) {
@@ -186,7 +186,7 @@ uint32_t TAtrac1SimpleBitAlloc::CheckBfuUsage(bool* changed,
return curBfuId;
}
-uint32_t TAtrac1SimpleBitAlloc::Write(const std::vector<TScaledBlock>& scaledBlocks, const TBlockSize& blockSize, float loudness) {
+uint32_t TAtrac1SimpleBitAlloc::Write(const std::vector<TScaledBlock>& scaledBlocks, const TAtrac1Data::TBlockSizeMod& blockSize, float loudness) {
uint32_t bfuIdx = BfuIdxConst ? BfuIdxConst - 1 : 7;
bool autoBfu = !BfuIdxConst;
float spread = AnalizeScaleFactorSpread(scaledBlocks);
@@ -261,7 +261,7 @@ TAtrac1BitStreamWriter::TAtrac1BitStreamWriter(ICompressedOutput* container)
void TAtrac1BitStreamWriter::WriteBitStream(const vector<uint32_t>& bitsPerEachBlock,
const std::vector<TScaledBlock>& scaledBlocks,
uint32_t bfuAmountIdx,
- const TBlockSize& blockSize) {
+ const TAtrac1Data::TBlockSizeMod& blockSize) {
NBitStream::TBitStream bitStream;
size_t bitUsed = 0;
if (bfuAmountIdx >= (1 << TAtrac1Data::BitsPerBfuAmountTabIdx)) {