X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=716d778b390c1c344e2a829c53498b4d4e5894f8;hb=f67d9e9b4b37e62c1ac2edae18c048f3bff5c075;hp=74ad7d362d0b2fe1e93dc31e928202b06689d23c;hpb=a2d4b5512a87a5d60e09fd69b6eec34332c714de;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 74ad7d36..716d778b 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -33,6 +33,7 @@
 #include <pv/data/logicsnapshot.h>
 #include <pv/data/decode/decoder.h>
 #include <pv/data/decode/annotation.h>
+#include <pv/sigsession.h>
 #include <pv/view/logicsignal.h>
 
 using boost::lock_guard;
@@ -58,17 +59,23 @@ const int64_t DecoderStack::DecodeChunkLength = 4096;
 
 mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(const srd_decoder *const dec) :
+DecoderStack::DecoderStack(pv::SigSession &session,
+	const srd_decoder *const dec) :
+	_session(session),
 	_samples_decoded(0)
 {
+	connect(&_session, SIGNAL(frame_began()), this, SLOT(on_new_frame()));
+
 	_stack.push_back(shared_ptr<decode::Decoder>(
 		new decode::Decoder(dec)));
 }
 
 DecoderStack::~DecoderStack()
 {
-	_decode_thread.interrupt();
-	_decode_thread.join();
+	if (_decode_thread.joinable()) {
+		_decode_thread.interrupt();
+		_decode_thread.join();
+	}
 }
 
 const std::list< boost::shared_ptr<decode::Decoder> >&
@@ -168,8 +175,10 @@ void DecoderStack::begin_decode()
 	shared_ptr<pv::view::LogicSignal> logic_signal;
 	shared_ptr<pv::data::Logic> data;
 
-	_decode_thread.interrupt();
-	_decode_thread.join();
+	if (_decode_thread.joinable()) {
+		_decode_thread.interrupt();
+		_decode_thread.join();
+	}
 
 	clear();
 
@@ -238,10 +247,45 @@ uint64_t DecoderStack::get_max_sample_count() const
 	return max_sample_count;
 }
 
+void DecoderStack::decode_data(
+	const shared_ptr<pv::data::LogicSnapshot> &snapshot,
+	srd_session *const session)
+{
+	uint8_t chunk[DecodeChunkLength];
+
+	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();
+
+	for (int64_t i = 0;
+		!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 + 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) * unit_size) != SRD_OK) {
+			_error_message = tr("Decoder reported an error");
+			break;
+		}
+
+		{
+			lock_guard<mutex> lock(_mutex);
+			_samples_decoded = chunk_end;
+		}
+	}
+
+}
+
 void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 {
 	srd_session *session;
-	uint8_t chunk[DecodeChunkLength];
 	srd_decoder_inst *prev_di = NULL;
 
 	assert(data);
@@ -257,20 +301,17 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 		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 chunk_sample_count =
-		DecodeChunkLength / snapshot->unit_size();
-
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
 
 	// Create the decoders
+	const shared_ptr<pv::data::LogicSnapshot> &snapshot = snapshots.front();
+	const unsigned int unit_size = snapshot->unit_size();
+
 	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
 	{
-		srd_decoder_inst *const di = dec->create_decoder_inst(session);
+		srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
 
 		if (!di)
 		{
@@ -294,28 +335,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 	srd_session_start(session);
 
-	for (int64_t i = 0;
-		!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 + 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("Decoder reported an error");
-			break;
-		}
-
-		{
-			lock_guard<mutex> lock(_mutex);
-			_samples_decoded = chunk_end;
-		}
-	}
+	decode_data(snapshot, session);
 
 	// Destroy the session
 	srd_session_destroy(session);
@@ -366,5 +386,10 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	d->new_decode_data();
 }
 
+void DecoderStack::on_new_frame()
+{
+	begin_decode();
+}
+
 } // namespace data
 } // namespace pv