X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c5a0e4a7a36d54957e2c96312a796782e1b7e90a;hp=2b07936840f49df3d76160f2b6250ed051278003;hb=e8bb7c69bce723ed2b116598012cf85deb191ba8;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 2b079368..c5a0e4a7 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -301,20 +301,18 @@ optional DecoderStack::wait_for_data() const } void DecoderStack::decode_data( - const int64_t sample_count, const unsigned int unit_size, + const int64_t abs_start_samplenum, const int64_t sample_count, const unsigned int unit_size, srd_session *const session) { - uint8_t chunk[DecodeChunkLength]; - const unsigned int chunk_sample_count = DecodeChunkLength / segment_->unit_size(); - for (int64_t i = 0; !interrupt_ && i < sample_count; + for (int64_t i = abs_start_samplenum; !interrupt_ && i < sample_count; i += chunk_sample_count) { const int64_t chunk_end = min( i + chunk_sample_count, sample_count); - segment_->get_samples(chunk, i, chunk_end); + const uint8_t* chunk = segment_->get_samples(i, chunk_end); if (srd_session_send(session, i, chunk_end, chunk, (chunk_end - i) * unit_size, unit_size) != SRD_OK) { @@ -382,8 +380,10 @@ void DecoderStack::decode_proc() srd_session_start(session); + int64_t abs_start_samplenum = 0; do { - decode_data(*sample_count, unit_size, session); + decode_data(abs_start_samplenum, *sample_count, unit_size, session); + abs_start_samplenum = *sample_count; } while (error_message_.isEmpty() && (sample_count = wait_for_data())); // Destroy the session