Added a reference to the SigSession in DecoderStack

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 74ad7d362d0b2fe1e93dc31e928202b06689d23c..2c68ef80d2a58e1b06531d4dbafd7d1f32ef14e2 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -58,7 +58,9 @@ 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)
 {
        _stack.push_back(shared_ptr<decode::Decoder>(
@@ -67,8 +69,10 @@ DecoderStack::DecoderStack(const srd_decoder *const 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 +172,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();
 
@@ -260,8 +266,9 @@ 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();
+       const unsigned int unit_size = snapshot->unit_size();
        const unsigned int chunk_sample_count =
-               DecodeChunkLength / snapshot->unit_size();
+               DecodeChunkLength / unit_size;
 
        // Create the session
        srd_session_new(&session);
@@ -270,7 +277,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
        // Create the decoders
        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)
                {
@@ -305,8 +312,8 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
                        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) {
+               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;
                }