X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=f08e349240571cabf18f64259ca205daaef8bcb1;hp=5b58761f9c1c3464121299c3c6259a907015a10a;hb=8a290daf90a91c998217f34a695a2dad41ea73e1;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 5b58761f..f08e3492 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -172,13 +172,17 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
-	const int64_t sample_count = snapshot->get_sample_count() - 1;
+	const int64_t sample_count = snapshot->get_sample_count();
+	const unsigned int chunk_sample_count =
+		DecodeChunkLength / snapshot->unit_size();
+
+	// Clear error message upon every new session run
+	_error_message = QString();
 
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
 
-
 	// Create the decoders
 	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
 	{
@@ -186,7 +190,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 		if (!di)
 		{
-			_error_message = tr("Failed to initialise decoder");
+			_error_message = tr("Failed to create decoder instance");
 			srd_session_destroy(session);
 			return;
 		}
@@ -209,17 +213,17 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	for (int64_t i = 0;
 		!boost::this_thread::interruption_requested() &&
 			i < sample_count;
-		i += DecodeChunkLength)
+		i += chunk_sample_count)
 	{
 		lock_guard<mutex> decode_lock(_global_decode_mutex);
 
 		const int64_t chunk_end = min(
-			i + DecodeChunkLength, sample_count);
+			i + chunk_sample_count, sample_count);
 		snapshot->get_samples(chunk, i, chunk_end);
 
 		if (srd_session_send(session, i, i + sample_count,
 				chunk, chunk_end - i) != SRD_OK) {
-			_error_message = tr("Failed to initialise decoder");
+			_error_message = tr("Decoder reported an error");
 			break;
 		}