X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=e667693e65dde4ec70bb77bd8fef3c980178807b;hp=073dcd523ec44146fb067cadd9957d5c523f2d76;hb=c2d4e9df36b9c19c691ff6fcb57066fd84a652e3;hpb=dd048a7ec035447c051c7937ce04aca5be065b4e

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 073dcd52..e667693e 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -246,16 +246,23 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 	assert(data);
 
+	// Check we have a snapshot of data
 	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
 		data->get_snapshots();
 	if (snapshots.empty())
 		return;
 
+	// Check that all decoders have the required probes
+	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+		if (!dec->have_required_probes())
+			return;
+
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 	const int64_t sample_count = snapshot->get_sample_count();
+	const unsigned int unit_size = snapshot->unit_size();
 	const unsigned int chunk_sample_count =
-		DecodeChunkLength / snapshot->unit_size();
+		DecodeChunkLength / unit_size;
 
 	// Create the session
 	srd_session_new(&session);
@@ -299,8 +306,8 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 			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) {
+		if (srd_session_send(session, i, i + sample_count, chunk,
+				(chunk_end - i) * unit_size) != SRD_OK) {
 			_error_message = tr("Decoder reported an error");
 			break;
 		}