Adjust to libsigrokdecode API changes

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

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index e1be16e3ea14898fcea05f0f9f34b48d101e04c0..9e7145f34fe4ffd2c715f141d9701dfb4b0b7a38 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -20,9 +20,18 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <boost/thread/thread.hpp>
+
+#include <stdexcept>
+
+#include <QDebug>
+
 #include "decoder.h"
 
-#include <pv/view/signal.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/logicsignal.h>
+#include <pv/view/decode/annotation.h>
 
 using namespace boost;
 using namespace std;
@@ -30,20 +39,31 @@ using namespace std;
 namespace pv {
 namespace data {
 
+const double Decoder::DecodeMargin = 1.0;
+const double Decoder::DecodeThreshold = 0.2;
+const int64_t Decoder::DecodeChunkLength = 4096;
+
+mutex Decoder::_global_decode_mutex;
+
 Decoder::Decoder(const srd_decoder *const dec,
        std::map<const srd_probe*,
-               boost::shared_ptr<pv::view::Signal> > probes) :
+               boost::shared_ptr<pv::view::LogicSignal> > probes,
+       GHashTable *options) :
        _decoder(dec),
        _probes(probes),
-       _decoder_inst(NULL)
+       _options(options)
 {
        init_decoder();
+
+       begin_decode();
 }
 
 Decoder::~Decoder()
 {
        _decode_thread.interrupt();
        _decode_thread.join();
+
+       g_hash_table_destroy(_options);
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -51,13 +71,36 @@ const srd_decoder* Decoder::get_decoder() const
        return _decoder;
 }
 
+const vector< shared_ptr<view::decode::Annotation> >
+       Decoder::annotations() const
+{
+       lock_guard<mutex> lock(_mutex);
+       return _annotations;
+}
+
+QString Decoder::error_message()
+{
+       lock_guard<mutex> lock(_mutex);
+       return _error_message;
+}
+
 void Decoder::begin_decode()
 {
        _decode_thread.interrupt();
        _decode_thread.join();
 
+       if (_probes.empty())
+               return;
+
+       // We get the logic data of the first probe in the list.
+       // This works because we are currently assuming all
+       // LogicSignals have the same data/snapshot
+       shared_ptr<pv::view::LogicSignal> sig = (*_probes.begin()).second;
+       assert(sig);
+       shared_ptr<data::Logic> data = sig->data();
+
        _decode_thread = boost::thread(&Decoder::decode_proc, this,
-               shared_ptr<data::Logic>());
+               data);
 }
 
 void Decoder::clear_snapshots()
@@ -66,13 +109,65 @@ void Decoder::clear_snapshots()
 
 void Decoder::init_decoder()
 {
-       _decoder_inst = srd_inst_new(_decoder->id, NULL);
-       assert(_decoder_inst);
+       if (!_probes.empty())
+       {
+               shared_ptr<pv::view::LogicSignal> logic_signal =
+                       dynamic_pointer_cast<pv::view::LogicSignal>(
+                               (*_probes.begin()).second);
+               if (logic_signal) {
+                       shared_ptr<pv::data::Logic> data(
+                               logic_signal->data());
+                       if (data) {
+                               _start_time = data->get_start_time();
+                               _samplerate = data->get_samplerate();
+                               if (_samplerate == 0.0)
+                                       _samplerate = 1.0;
+                       }
+               }
+       }
+}
+
+void Decoder::decode_proc(shared_ptr<data::Logic> data)
+{
+       srd_session *session;
+       uint8_t chunk[DecodeChunkLength];
 
-       GHashTable *probes = g_hash_table_new_full(g_str_hash,
+       assert(data);
+
+       _annotations.clear();
+
+       const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
+               data->get_snapshots();
+       if (snapshots.empty())
+               return;
+
+       const shared_ptr<pv::data::LogicSnapshot> &snapshot =
+               snapshots.front();
+       const int64_t sample_count = snapshot->get_sample_count() - 1;
+
+       // Create the session
+       srd_session_new(&session);
+       assert(session);
+
+       srd_session_metadata_set(session, SRD_CONF_SAMPLERATE,
+               g_variant_new_uint64((uint64_t)_samplerate));
+
+       srd_pd_output_callback_add(session, SRD_OUTPUT_ANN,
+               Decoder::annotation_callback, this);
+
+       // Create the decoder instance
+       srd_decoder_inst *const decoder_inst = srd_inst_new(
+               session, _decoder->id, _options);
+       if(!decoder_inst) {
+               _error_message = tr("Failed to initialise decoder");
+               return;
+       }
+
+       // Setup the probes
+       GHashTable *const probes = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-       for(map<const srd_probe*, shared_ptr<view::Signal> >::
+       for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
                const_iterator i = _probes.begin();
                i != _probes.end(); i++)
        {
@@ -83,12 +178,46 @@ void Decoder::init_decoder()
                g_hash_table_insert(probes, (*i).first->id, gvar);
        }
 
-       srd_inst_probe_set_all(_decoder_inst, probes);
+       srd_inst_probe_set_all(decoder_inst, probes);
+
+       // Start the session
+       srd_session_start(session);
+
+       for (int64_t i = 0;
+               !this_thread::interruption_requested() && i < sample_count;
+               i += DecodeChunkLength)
+       {
+               lock_guard<mutex> decode_lock(_global_decode_mutex);
+
+               const int64_t chunk_end = min(
+                       i + DecodeChunkLength, 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");
+                       break;
+               }
+       }
+
+       // Destroy the session
+       srd_session_destroy(session);
 }
 
-void Decoder::decode_proc(shared_ptr<data::Logic> data)
+void Decoder::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
-       (void)data;
+       using namespace pv::view::decode;
+
+       assert(pdata);
+       assert(decoder);
+
+       Decoder *const d = (Decoder*)decoder;
+
+       shared_ptr<Annotation> a(new Annotation(pdata));
+       lock_guard<mutex> lock(d->_mutex);
+       d->_annotations.push_back(a);
+
+       d->new_decode_data();
 }
 
 } // namespace data