#include "signaldata.h"
+#include <atomic>
+#include <condition_variable>
#include <list>
+#include <map>
+#include <memory>
+#include <thread>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
+#include <boost/optional.hpp>
#include <QObject>
#include <QString>
+#include <pv/data/decode/row.h>
+#include <pv/data/decode/rowdata.h>
+
struct srd_decoder;
-struct srd_probe;
+struct srd_decoder_annotation_row;
+struct srd_channel;
struct srd_proto_data;
+struct srd_session;
namespace DecoderStackTest {
-class TwoDecoderStack;
+struct TwoDecoderStack;
}
namespace pv {
+class SigSession;
+
namespace view {
class LogicSignal;
}
namespace data {
+class LogicSnapshot;
+
namespace decode {
class Annotation;
class Decoder;
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 std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
- void push(boost::shared_ptr<decode::Decoder> decoder);
+ const std::list< std::shared_ptr<decode::Decoder> >& stack() const;
+ void push(std::shared_ptr<decode::Decoder> decoder);
void remove(int index);
int64_t samples_decoded() const;
+ std::vector<decode::Row> get_visible_rows() const;
+
/**
* Extracts sorted annotations between two period into a vector.
*/
void get_annotation_subset(
std::vector<pv::data::decode::Annotation> &dest,
- uint64_t start_sample, uint64_t end_sample) const;
+ const decode::Row &row, uint64_t start_sample,
+ uint64_t end_sample) const;
QString error_message();
void begin_decode();
private:
- void decode_proc(boost::shared_ptr<data::Logic> data);
-
- bool index_entry_start_sample_gt(
- const uint64_t sample, const size_t index) const;
- bool index_entry_end_sample_lt(
- const size_t index, const uint64_t sample) const;
- bool index_entry_end_sample_gt(
- const uint64_t sample, const size_t index) const;
-
- void insert_annotation_into_start_index(
- const pv::data::decode::Annotation &a,
- const size_t storage_offset);
- void insert_annotation_into_end_index(
- const pv::data::decode::Annotation &a,
- const size_t storage_offset);
+ 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);
-signals:
+private Q_SLOTS:
+ void on_new_frame();
+
+ void on_data_received();
+
+ void on_frame_ended();
+
+Q_SIGNALS:
void new_decode_data();
private:
+ pv::SigSession &_session;
/**
* This mutex prevents more than one decode operation occuring
* @todo A proper solution should be implemented to allow multiple
* decode operations.
*/
- static boost::mutex _global_decode_mutex;
+ static std::mutex _global_decode_mutex;
+
+ std::list< std::shared_ptr<decode::Decoder> > _stack;
+
+ std::shared_ptr<pv::data::LogicSnapshot> _snapshot;
- std::list< boost::shared_ptr<decode::Decoder> > _stack;
+ mutable std::mutex _input_mutex;
+ mutable std::condition_variable _input_cond;
+ int64_t _sample_count;
+ bool _frame_complete;
- mutable boost::mutex _mutex;
+ mutable std::mutex _output_mutex;
int64_t _samples_decoded;
- std::vector<pv::data::decode::Annotation> _annotations;
- /**
- * _ann_start_index and _ann_end_index contain lists of annotions
- * (represented by offsets in the _annotations vector), sorted in
- * ascending ordered by the start_sample and end_sample respectively.
- */
- std::vector<size_t> _ann_start_index, _ann_end_index;
+ std::map<const decode::Row, decode::RowData> _rows;
+
+ std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
QString _error_message;
- boost::thread _decode_thread;
+ std::thread _decode_thread;
+ std::atomic<bool> _interrupt;
- friend class DecoderStackTest::TwoDecoderStack;
+ friend struct DecoderStackTest::TwoDecoderStack;
};
} // namespace data