First pass at decoder for split symbols/colors

Probably some optimizations here...
sz3 · Sep 23, 2023 · 113c92d · 113c92d
1 parent 742b91b
commit 113c92d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/lib/encoder/Decoder.h b/src/lib/encoder/Decoder.h
@@ -69,6 +69,9 @@ inline unsigned Decoder::do_decode(CimbReader& reader, STREAM& ostream)
 	std::vector<PositionData> colorPositions;
 	colorPositions.resize(reader.num_reads()); // the number of cells == reader.num_reads(). Can we calculate this from config at compile time?
 
+	unsigned bitsPerSymbol = cimbar::Config::symbol_bits();
+	unsigned maxSymbolBit = reader.num_reads() * cimbar::Config::symbol_bits();
+
 	// read symbols first
 	while (!reader.done())
 	{
@@ -77,10 +80,13 @@ inline unsigned Decoder::do_decode(CimbReader& reader, STREAM& ostream)
 		PositionData pos;
 		unsigned bits = reader.read(pos);
 
-		unsigned bitPos = interleaveLookup[pos.i] * _bitsPerOp;
-		bb.write(bits, bitPos, _bitsPerOp);
+		unsigned bitPos = interleaveLookup[pos.i] * bitsPerSymbol; // bitspersymbol, *iff* we're in the new mode
+		bb.write(bits, bitPos, bitsPerSymbol);
+
+		// is colorBitPos == interleaveLookup[pos.i] * _colorBits + (maxSymbolBitPos)?
+		// where maxSymbolBiPos is interleaveLookup[-1] * bitspersymbol ?
 
-		colorPositions[pos.i] = {bitPos, pos.x, pos.y};
+		colorPositions[pos.i] = {maxSymbolBit + (interleaveLookup[pos.i] * _colorBits), pos.x, pos.y}; // if no mode, bitPos is different...
 	}
 
 	// then decode colors.