Integrated decode

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

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index e1be16e3ea14898fcea05f0f9f34b48d101e04c0..2848d16ca4dffd166697b2517193acaec7030592 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -20,9 +20,14 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <boost/thread/thread.hpp>
+
 #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,6 +35,10 @@ 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;
+
 Decoder::Decoder(const srd_decoder *const dec,
        std::map<const srd_probe*,
                boost::shared_ptr<pv::view::Signal> > probes) :
@@ -38,6 +47,7 @@ Decoder::Decoder(const srd_decoder *const dec,
        _decoder_inst(NULL)
 {
        init_decoder();
+       begin_decode();
 }
 
 Decoder::~Decoder()
@@ -51,13 +61,33 @@ const srd_decoder* Decoder::get_decoder() const
        return _decoder;
 }
 
+const vector< shared_ptr<view::decode::Annotation> >
+       Decoder::annotations() const
+{
+       lock_guard<mutex> lock(_annotations_mutex);
+       return _annotations;
+}
+
 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::Signal> sig = (*_probes.begin()).second;
+       assert(sig);
+       const pv::view::LogicSignal *const l =
+               dynamic_cast<pv::view::LogicSignal*>(sig.get());
+       assert(l);
+       shared_ptr<data::Logic> data = l->data();
+
        _decode_thread = boost::thread(&Decoder::decode_proc, this,
-               shared_ptr<data::Logic>());
+               data);
 }
 
 void Decoder::clear_snapshots()
@@ -66,9 +96,26 @@ void Decoder::clear_snapshots()
 
 void Decoder::init_decoder()
 {
+       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) {
+                               _samplerate = data->get_samplerate();
+                               _start_time = data->get_start_time();
+                       }
+               }
+       }
+
        _decoder_inst = srd_inst_new(_decoder->id, NULL);
        assert(_decoder_inst);
 
+       _decoder_inst->data_samplerate = _samplerate;
+
        GHashTable *probes = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
@@ -88,7 +135,56 @@ void Decoder::init_decoder()
 
 void Decoder::decode_proc(shared_ptr<data::Logic> data)
 {
-       (void)data;
+       uint8_t chunk[DecodeChunkLength];
+
+       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;
+       double samplerate = data->get_samplerate();
+
+       // Show sample rate as 1Hz when it is unknown
+       if (samplerate == 0.0)
+               samplerate = 1.0;
+
+       srd_session_start(_probes.size(), snapshot->unit_size(), samplerate);
+
+       srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+               Decoder::annotation_callback, this);
+
+       for (int64_t i = 0;
+               !this_thread::interruption_requested() && i < sample_count;
+               i += DecodeChunkLength)
+       {
+               const int64_t chunk_end = min(
+                       i + DecodeChunkLength, sample_count);
+               snapshot->get_samples(chunk, i, chunk_end);
+
+               if (srd_session_send(i, chunk, chunk_end - i) != SRD_OK)
+                       break;
+       }
+}
+
+void Decoder::annotation_callback(srd_proto_data *pdata, void *decoder)
+{
+       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->_annotations_mutex);
+       d->_annotations.push_back(a);
 }
 
 } // namespace data