#include "signaldata.h"
-#include <map>
+#include <list>
+#include <boost/optional.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <QObject>
#include <QString>
-#include <glib.h>
+#include <pv/data/decode/row.h>
+#include <pv/data/decode/rowdata.h>
struct srd_decoder;
+struct srd_decoder_annotation_row;
struct srd_probe;
struct srd_proto_data;
+struct srd_session;
namespace DecoderStackTest {
class TwoDecoderStack;
namespace pv {
+class SigSession;
+
namespace view {
class LogicSignal;
+}
+
+namespace data {
+
+class LogicSnapshot;
namespace decode {
class Annotation;
+class Decoder;
}
-}
-
-namespace data {
-
class Logic;
class DecoderStack : public QObject, public SignalData
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
+ static const unsigned int DecodeNotifyPeriod;
public:
- DecoderStack(const srd_decoder *const decoder);
+ DecoderStack(pv::SigSession &_session,
+ const srd_decoder *const decoder);
virtual ~DecoderStack();
- const srd_decoder* decoder() const;
-
- const std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >&
- probes() const;
- void set_probes(std::map<const srd_probe*,
- boost::shared_ptr<view::LogicSignal> > probes);
+ const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
+ void push(boost::shared_ptr<decode::Decoder> decoder);
+ void remove(int index);
- const GHashTable* options() const;
+ int64_t samples_decoded() const;
- void set_option(const char *id, GVariant *value);
+ std::vector<decode::Row> get_visible_rows() const;
- const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
- annotations() const;
+ /**
+ * Extracts sorted annotations between two period into a vector.
+ */
+ void get_annotation_subset(
+ std::vector<pv::data::decode::Annotation> &dest,
+ const decode::Row &row, uint64_t start_sample,
+ uint64_t end_sample) const;
QString error_message();
- void clear_snapshots();
+ void clear();
+
+ uint64_t get_max_sample_count() const;
-private:
void begin_decode();
- void decode_proc(boost::shared_ptr<data::Logic> data);
+private:
+ boost::optional<int64_t> wait_for_data() const;
+
+ void decode_data(const int64_t sample_count,
+ const unsigned int unit_size, srd_session *const session);
+
+ void decode_proc();
static void annotation_callback(srd_proto_data *pdata,
void *decoder);
+private slots:
+ void on_new_frame();
+
+ void on_data_received();
+
+ void on_frame_ended();
+
signals:
void new_decode_data();
private:
+ pv::SigSession &_session;
/**
* This mutex prevents more than one decode operation occuring
*/
static boost::mutex _global_decode_mutex;
- const srd_decoder *const _decoder;
- std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
- _probes;
- GHashTable *_options;
+ std::list< boost::shared_ptr<decode::Decoder> > _stack;
+
+ boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+
+ mutable boost::mutex _input_mutex;
+ mutable boost::condition_variable _input_cond;
+ int64_t _sample_count;
+ bool _frame_complete;
+
+ mutable boost::mutex _output_mutex;
+ int64_t _samples_decoded;
+
+ std::map<const decode::Row, decode::RowData> _rows;
+
+ std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
- mutable boost::mutex _mutex;
- std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
- _annotations;
QString _error_message;
boost::thread _decode_thread;