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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 2817d292..f08e3492 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -32,11 +32,16 @@
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.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 {
@@ -47,7 +52,8 @@ const int64_t DecoderStack::DecodeChunkLength = 4096;
 
 mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(const srd_decoder *const dec)
+DecoderStack::DecoderStack(const srd_decoder *const dec) :
+	_samples_decoded(0)
 {
 	_stack.push_back(shared_ptr<decode::Decoder>(
 		new decode::Decoder(dec)));
@@ -71,8 +77,29 @@ void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
 	_stack.push_back(decoder);
 }
 
-const vector< shared_ptr<view::decode::Annotation> >
-	DecoderStack::annotations() const
+void DecoderStack::remove(int index)
+{
+	using pv::data::decode::Decoder;
+
+	assert(index >= 0);
+	assert(index < (int)_stack.size());
+
+	// Find the decoder in the stack
+	list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
+	for(int i = 0; i < index; i++, iter++)
+		assert(iter != _stack.end());
+
+	// Delete the element
+	_stack.erase(iter);
+}
+
+int64_t DecoderStack::samples_decoded() const
+{
+	lock_guard<mutex> decode_lock(_mutex);
+	return _samples_decoded;
+}
+
+const vector<decode::Annotation> DecoderStack::annotations() const
 {
 	lock_guard<mutex> lock(_mutex);
 	return _annotations;
@@ -92,6 +119,8 @@ void DecoderStack::begin_decode()
 	_decode_thread.interrupt();
 	_decode_thread.join();
 
+	_samples_decoded = 0;
+
 	_annotations.clear();
 
 	// We get the logic data of the first probe in the list.
@@ -100,7 +129,7 @@ void DecoderStack::begin_decode()
 	BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
 		if (dec && !dec->probes().empty() &&
 			((logic_signal = (*dec->probes().begin()).second)) &&
-			((data = logic_signal->data())))
+			((data = logic_signal->logic_data())))
 			break;
 
 	if (!data)
@@ -108,7 +137,7 @@ void DecoderStack::begin_decode()
 
 	// Get the samplerate and start time
 	_start_time = data->get_start_time();
-	_samplerate = data->get_samplerate();
+	_samplerate = data->samplerate();
 	if (_samplerate == 0.0)
 		_samplerate = 1.0;
 
@@ -116,8 +145,16 @@ void DecoderStack::begin_decode()
 		data);
 }
 
-void DecoderStack::clear_snapshots()
+void DecoderStack::clear()
 {
+	_annotations.clear();
+}
+
+uint64_t DecoderStack::get_max_sample_count() const
+{
+	if (_annotations.empty())
+		return 0;
+	return _annotations.back().end_sample();
 }
 
 void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@ -135,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)
 	{
@@ -149,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;
 		}
@@ -170,20 +211,26 @@ 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;
 		}
+
+		{
+			lock_guard<mutex> lock(_mutex);
+			_samples_decoded = chunk_end;
+		}
 	}
 
 	// Destroy the session
@@ -192,16 +239,15 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
-	using namespace pv::view::decode;
+	using pv::data::decode::Annotation;
 
 	assert(pdata);
 	assert(decoder);
 
 	DecoderStack *const d = (DecoderStack*)decoder;
 
-	shared_ptr<Annotation> a(new Annotation(pdata));
 	lock_guard<mutex> lock(d->_mutex);
-	d->_annotations.push_back(a);
+	d->_annotations.push_back(Annotation(pdata));
 
 	d->new_decode_data();
 }