diff options
author | Daniil Cherednik <dan.cherednik@gmail.com> | 2025-06-21 21:58:33 +0200 |
---|---|---|
committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2025-06-22 14:37:24 +0200 |
commit | 78e40b52bdd2355245292eacb0d34fe7e96ac208 (patch) | |
tree | 1ae5a9748ea3d5ac14f9c8a6de58a8fbaa62d870 /src | |
parent | 45b630c6901d36d06a9fb251c0bf8a91848fd740 (diff) | |
download | atracdenc-78e40b52bdd2355245292eacb0d34fe7e96ac208.tar.gz |
Fix multiple wrong debug asserts
Diffstat (limited to 'src')
-rw-r--r-- | src/atrac/at3p/at3p_bitstream.cpp | 6 | ||||
-rw-r--r-- | src/atrac/at3p/at3p_bitstream_impl.h | 2 | ||||
-rw-r--r-- | src/atrac/at3p/at3p_gha.h | 1 | ||||
-rw-r--r-- | src/pcmengin.h | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/atrac/at3p/at3p_bitstream.cpp b/src/atrac/at3p/at3p_bitstream.cpp index 2d48729..0b5e239 100644 --- a/src/atrac/at3p/at3p_bitstream.cpp +++ b/src/atrac/at3p/at3p_bitstream.cpp @@ -167,7 +167,7 @@ void TWordLenEncoder::VlEncode(const std::array<TVlcElement, 8>& wlTab, size_t i IBitStreamPartEncoder::EStatus TWordLenEncoder::Encode(void* frameData, TBitAllocHandler&) { auto specFrame = TSpecFrame::Cast(frameData); - ASSERT(specFrame->WordLen.size() > specFrame->NumQuantUnits); + ASSERT(specFrame->WordLen.size() >= specFrame->NumQuantUnits); int8_t deltasCh0[32]; //int8_t deltasCh1[32]; @@ -338,7 +338,7 @@ void TQuantUnitsEncoder::EncodeQuSpectra(const int* qspec, const size_t num_spec val |= t; } - ASSERT(val > 255); + ASSERT(val <= 255); const TVlcElement& el = vlcTab.at(val); @@ -719,7 +719,7 @@ void TAt3PBitStream::WriteFrame(int channels, const TAt3PGhaData* tonalBlock, co std::vector<char> buf = bitStream.GetBytes(); - ASSERT(bitStream.GetSizeInBits() > FrameSz * 8); + ASSERT(bitStream.GetSizeInBits() <= FrameSz * 8); buf.resize(FrameSz); Container->WriteFrame(buf); diff --git a/src/atrac/at3p/at3p_bitstream_impl.h b/src/atrac/at3p/at3p_bitstream_impl.h index 5e0fded..a73cc1a 100644 --- a/src/atrac/at3p/at3p_bitstream_impl.h +++ b/src/atrac/at3p/at3p_bitstream_impl.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "atrac/at3p/at3p_gha.h" +#include "at3p_gha.h" #include "at3p_bitstream.h" #include <lib/bitstream/bitstream.h> #include <lib/bs_encode/encode.h> diff --git a/src/atrac/at3p/at3p_gha.h b/src/atrac/at3p/at3p_gha.h index 702f593..5b5c7de 100644 --- a/src/atrac/at3p/at3p_gha.h +++ b/src/atrac/at3p/at3p_gha.h @@ -20,6 +20,7 @@ #include <config.h> +#include <cstdint> #include <array> #include <memory> #include <vector> diff --git a/src/pcmengin.h b/src/pcmengin.h index 8d1db3f..37d7b18 100644 --- a/src/pcmengin.h +++ b/src/pcmengin.h @@ -182,7 +182,6 @@ public: } } - assert(lastPos == Buffer.Size()); if (Writer) { Writer->Write(Buffer, lastPos); } |