X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=1c6b3c6b57c792e5c040e62593a0bd8161eef94e;hp=9d80e9b300e26782cc7873d8876ceb6f1372e892;hb=9242129958c996f9ff71da7c7b74d7983b5c59f6;hpb=375b6216bdcae93f63538968be84fe514f8b90e5

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 9d80e9b3..1c6b3c6b 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -20,6 +20,7 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread/thread.hpp>
 
@@ -99,10 +100,27 @@ int64_t DecoderStack::samples_decoded() const
 	return _samples_decoded;
 }
 
-const vector<decode::Annotation> DecoderStack::annotations() const
+void DecoderStack::get_annotation_subset(
+	std::vector<pv::data::decode::Annotation> &dest,
+	uint64_t start_sample, uint64_t end_sample) const
 {
 	lock_guard<mutex> lock(_mutex);
-	return _annotations;
+
+	const vector<size_t>::const_iterator start_iter =
+		lower_bound(_ann_end_index.begin(),
+			_ann_end_index.end(), start_sample,
+			bind(&DecoderStack::index_entry_end_sample_lt,
+				this, _1, _2));
+
+	const vector<size_t>::const_iterator end_iter =
+		upper_bound(_ann_start_index.begin(),
+			_ann_start_index.end(), end_sample,
+			bind(&DecoderStack::index_entry_start_sample_gt,
+				this, _1, _2));
+
+	for (vector<size_t>::const_iterator i = start_iter;
+		i != _ann_end_index.end() && *i != *end_iter; i++)
+		dest.push_back(_annotations[*i]);
 }
 
 QString DecoderStack::error_message()
@@ -121,7 +139,7 @@ void DecoderStack::begin_decode()
 
 	_samples_decoded = 0;
 
-	_annotations.clear();
+	clear();
 
 	// We get the logic data of the first probe in the list.
 	// This works because we are currently assuming all
@@ -148,6 +166,8 @@ void DecoderStack::begin_decode()
 void DecoderStack::clear()
 {
 	_annotations.clear();
+	_ann_start_index.clear();
+	_ann_end_index.clear();
 }
 
 uint64_t DecoderStack::get_max_sample_count() const
@@ -190,7 +210,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;
 		}
@@ -223,7 +243,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 		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,17 +257,100 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	srd_session_destroy(session);
 }
 
+bool DecoderStack::index_entry_start_sample_gt(
+	const uint64_t sample, const size_t index) const
+{
+	assert(index < _annotations.size());
+	return _annotations[index].start_sample() > sample;
+}
+
+bool DecoderStack::index_entry_end_sample_lt(
+	const size_t index, const uint64_t sample) const
+{
+	assert(index < _annotations.size());
+	return _annotations[index].end_sample() < sample;
+}
+
+bool DecoderStack::index_entry_end_sample_gt(
+	const uint64_t sample, const size_t index) const
+{
+	assert(index < _annotations.size());
+	return _annotations[index].end_sample() > sample;
+}
+
+void DecoderStack::insert_annotation_into_start_index(
+	const pv::data::decode::Annotation &a, const size_t storage_offset)
+{
+	vector<size_t>::iterator i = _ann_start_index.end();
+	if (!_ann_start_index.empty() &&
+		_annotations[_ann_start_index.back()].start_sample() >
+			a.start_sample())
+		i = upper_bound(_ann_start_index.begin(),
+			_ann_start_index.end(), a.start_sample(),
+			bind(&DecoderStack::index_entry_start_sample_gt,
+				this, _1, _2));
+
+	_ann_start_index.insert(i, storage_offset);
+}
+
+void DecoderStack::insert_annotation_into_end_index(
+	const pv::data::decode::Annotation &a, const size_t storage_offset)
+{
+	vector<size_t>::iterator i = _ann_end_index.end();
+	if (!_ann_end_index.empty() &&
+		_annotations[_ann_end_index.back()].end_sample() <
+			a.end_sample())
+		i = upper_bound(_ann_end_index.begin(),
+			_ann_end_index.end(), a.end_sample(),
+			bind(&DecoderStack::index_entry_end_sample_gt,
+				this, _1, _2));
+
+	_ann_end_index.insert(i, storage_offset);
+}
+
 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);
+		}
+	}
+
+	const size_t offset = d->_annotations.size();
+	d->_annotations.push_back(a);
+
+	d->insert_annotation_into_start_index(a, offset);
+	d->insert_annotation_into_end_index(a, offset);
 
 	d->new_decode_data();
 }