Begin a new decode session when a new frame begins

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 323f5cc2cd4b45397cf18e1cd59560dc0ef17f33..e73cfc3371bcda03c8b1a955eca71285a3dd0833 100644 (file)
--- 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> >&
@@ -103,7 +110,7 @@ int64_t DecoderStack::samples_decoded() const
        return _samples_decoded;
 }
 
-std::vector<Row> DecoderStack::get_rows() const
+std::vector<Row> DecoderStack::get_visible_rows() const
 {
        lock_guard<mutex> lock(_mutex);
 
@@ -112,6 +119,9 @@ std::vector<Row> DecoderStack::get_rows() const
        BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
        {
                assert(dec);
+               if (!dec->shown())
+                       continue;
+
                const srd_decoder *const decc = dec->decoder();
                assert(dec->decoder());
 
@@ -165,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();
 
@@ -243,16 +255,23 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
        assert(data);
 
+       // Check we have a snapshot of data
        const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
                data->get_snapshots();
        if (snapshots.empty())
                return;
 
+       // Check that all decoders have the required probes
+       BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
+               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 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);
@@ -261,7 +280,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)
                {
@@ -296,8 +315,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;
                }
@@ -357,5 +376,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