Skip to content

Commit 78e40b5

Browse files
committed
Fix multiple wrong debug asserts
1 parent 45b630c commit 78e40b5

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/atrac/at3p/at3p_bitstream.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void TWordLenEncoder::VlEncode(const std::array<TVlcElement, 8>& wlTab, size_t i
167167
IBitStreamPartEncoder::EStatus TWordLenEncoder::Encode(void* frameData, TBitAllocHandler&) {
168168
auto specFrame = TSpecFrame::Cast(frameData);
169169

170-
ASSERT(specFrame->WordLen.size() > specFrame->NumQuantUnits);
170+
ASSERT(specFrame->WordLen.size() >= specFrame->NumQuantUnits);
171171

172172
int8_t deltasCh0[32];
173173
//int8_t deltasCh1[32];
@@ -338,7 +338,7 @@ void TQuantUnitsEncoder::EncodeQuSpectra(const int* qspec, const size_t num_spec
338338
val |= t;
339339
}
340340

341-
ASSERT(val > 255);
341+
ASSERT(val <= 255);
342342

343343
const TVlcElement& el = vlcTab.at(val);
344344

@@ -719,7 +719,7 @@ void TAt3PBitStream::WriteFrame(int channels, const TAt3PGhaData* tonalBlock, co
719719

720720
std::vector<char> buf = bitStream.GetBytes();
721721

722-
ASSERT(bitStream.GetSizeInBits() > FrameSz * 8);
722+
ASSERT(bitStream.GetSizeInBits() <= FrameSz * 8);
723723

724724
buf.resize(FrameSz);
725725
Container->WriteFrame(buf);

src/atrac/at3p/at3p_bitstream_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919
*/
2020

21-
#include "atrac/at3p/at3p_gha.h"
21+
#include "at3p_gha.h"
2222
#include "at3p_bitstream.h"
2323
#include <lib/bitstream/bitstream.h>
2424
#include <lib/bs_encode/encode.h>

src/atrac/at3p/at3p_gha.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include <config.h>
2222

23+
#include <cstdint>
2324
#include <array>
2425
#include <memory>
2526
#include <vector>

src/pcmengin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ class TPCMEngine {
182182
}
183183
}
184184

185-
assert(lastPos == Buffer.Size());
186185
if (Writer) {
187186
Writer->Write(Buffer, lastPos);
188187
}

0 commit comments

Comments
 (0)