salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add back support for capturing raw records.

Browse Source
This commit is contained in:
David Given
2022-02-12 15:16:25 +01:00
parent e8d1c90182
commit 03dd9e6e83
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/decoders/decoders.cc
View File

@@ -88,7 +88,10 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
/* Read the sector record. */
Fluxmap::Position before = fmr.tell();
decodeSectorRecord();
pushRecord(before, fmr.tell());
if (_sector->status == Sector::DATA_MISSING)
{
/* The data is in a separate record. */
@@ -99,10 +102,14 @@ std::unique_ptr<TrackDataFlux> AbstractDecoder::decodeToSectors(
if (fmr.eof() || !_sector->clock)
break;
before = fmr.tell();
decodeDataRecord();
if (_sector->status != Sector::DATA_MISSING)
{
pushRecord(before, fmr.tell());
break;
}
fmr.skipToEvent(F_BIT_PULSE);
resetFluxDecoder();
@@ -126,10 +133,8 @@ void AbstractDecoder::pushRecord(const Fluxmap::Position& start, const Fluxmap::
record->endTime = end.ns();
record->clock = _sector->clock;
_fmr->seek(start);
FluxDecoder decoder(_fmr, _sector->clock, _config);
record->rawData = toBytes(decoder.readBits(end));
_fmr->seek(here);
record->rawData = toBytes(_recordBits);
_recordBits.clear();
}
void AbstractDecoder::resetFluxDecoder()
@@ -153,7 +158,9 @@ void AbstractDecoder::seekToIndexMark()
std::vector<bool> AbstractDecoder::readRawBits(unsigned count)
{
return _decoder->readBits(count);
auto bits = _decoder->readBits(count);
_recordBits.insert(_recordBits.end(), bits.begin(), bits.end());
return bits;
}
uint8_t AbstractDecoder::readRaw8()

1
lib/decoders/decoders.h
View File

@@ -85,6 +85,7 @@ protected:
std::unique_ptr<TrackDataFlux> _trackdata;
std::shared_ptr<Sector> _sector;
std::unique_ptr<FluxDecoder> _decoder;
std::vector<bool> _recordBits;
private:
FluxmapReader* _fmr = nullptr;