X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=d209e1a9b19e1f783f46baa0b8b9bb5a9320dd65;hp=c2ae9116856161a94826db1adeadcfe9366d647b;hb=6d8b05622f1e422c7193656c9eac3ebae5b6b934;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index c2ae9116..d209e1a9 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -35,8 +35,13 @@
 #include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
 
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::deque;
+using std::min;
+using std::list;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -167,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)
 	{
@@ -181,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;
 		}
@@ -202,18 +211,19 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	srd_session_start(session);
 
 	for (int64_t i = 0;
-		!this_thread::interruption_requested() && i < sample_count;
-		i += DecodeChunkLength)
+		!boost::this_thread::interruption_requested() &&
+			i < sample_count;
+		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;
 		}
 
@@ -231,13 +241,35 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
 	using pv::data::decode::Annotation;
 
+	GSList *l, *ll;
+	int row, ann_class;
+	struct srd_decoder_annotation_row *ann_row;
+
 	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);
+
+	const shared_ptr<decode::Decoder> &dec = *d->stack().begin();
+
+	for (l = dec->decoder()->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();
 }