X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c216d8d2627344264d940e4ab7a8d1a3db26c6d5;hb=4e6301f9744f2c97b6ee7982ba56903f63cc455e;hp=2b07936840f49df3d76160f2b6250ed051278003;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 2b079368..c216d8d2 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -53,7 +53,7 @@ namespace data {
 
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength = 4096;
+const int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024;
 const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
 mutex DecoderStack::global_srd_mutex_;
@@ -301,20 +301,18 @@ optional<int64_t> 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