Pass new unit_size argument to srd_inst_probe_set_all()

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 073dcd523ec44146fb067cadd9957d5c523f2d76..9b02f9e929cc41b9ca75709acc27f3793745c333 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -246,16 +246,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);
@@ -264,7 +271,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)
                {
@@ -299,8 +306,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;
                }