X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=645b92f32474d44aafcde927023bc5c4f36fd60b;hb=bc870bcf81b99afcaf4c358f4e68643d1bf4efaf;hp=5b58761f9c1c3464121299c3c6259a907015a10a;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 5b58761..645b92f 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;
 		}
 
@@ -237,13 +241,41 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
 	using pv::data::decode::Annotation;
 
+	GSList *l, *ll;
+	int row, ann_class, idx = 0;
+	struct srd_decoder_annotation_row *ann_row;
+	struct srd_decoder *decc;
+
 	assert(pdata);
 	assert(decoder);
 
 	DecoderStack *const d = (DecoderStack*)decoder;
 
 	lock_guard<mutex> lock(d->_mutex);
-	d->_annotations.push_back(Annotation(pdata));
+
+	Annotation a = Annotation(pdata);
+
+	decc = pdata->pdo->di->decoder;
+	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, d->stack()) {
+		if (dec->decoder() == decc)
+			break;
+		idx++;
+	}
+	a.set_pd_index(idx);
+
+	for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
+	{
+		ann_row = (struct srd_decoder_annotation_row *)l->data;
+
+		for (ll = ann_row->ann_classes, ann_class = 0; ll;
+					ll = ll->next, ann_class++)
+		{
+			if (GPOINTER_TO_INT(ll->data) == a.format())
+				a.set_row(row);
+		}
+	}
+
+	d->_annotations.push_back(a);
 
 	d->new_decode_data();
 }