projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the time format function into a separate file.
[pulseview.git]
/
pv
/
data
/
decoderstack.h
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 80ad64cdfebf90398213d801ef184f128cc7d4bd..2eeaf1c76fa4c1cba4718c8e627c05e1bb0e7afa 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-25,6
+25,7
@@
#include <list>
#include <list>
+#include <boost/optional.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
@@
-36,8
+37,9
@@
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_decoder;
struct srd_decoder_annotation_row;
-struct srd_
probe
;
+struct srd_
channel
;
struct srd_proto_data;
struct srd_proto_data;
+struct srd_session;
namespace DecoderStackTest {
class TwoDecoderStack;
namespace DecoderStackTest {
class TwoDecoderStack;
@@
-45,12
+47,16
@@
class TwoDecoderStack;
namespace pv {
namespace pv {
+class SigSession;
+
namespace view {
class LogicSignal;
}
namespace data {
namespace view {
class LogicSignal;
}
namespace data {
+class LogicSnapshot;
+
namespace decode {
class Annotation;
class Decoder;
namespace decode {
class Annotation;
class Decoder;
@@
-66,9
+72,11
@@
private:
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
+ static const unsigned int DecodeNotifyPeriod;
public:
public:
- DecoderStack(const srd_decoder *const decoder);
+ DecoderStack(pv::SigSession &_session,
+ const srd_decoder *const decoder);
virtual ~DecoderStack();
virtual ~DecoderStack();
@@
-78,7
+86,7
@@
public:
int64_t samples_decoded() const;
int64_t samples_decoded() const;
- std::vector<decode::Row> get_rows() const;
+ std::vector<decode::Row> get_
visible_
rows() const;
/**
* Extracts sorted annotations between two period into a vector.
/**
* Extracts sorted annotations between two period into a vector.
@@
-97,15
+105,28
@@
public:
void begin_decode();
private:
void begin_decode();
private:
- void decode_proc(boost::shared_ptr<data::Logic> data);
+ 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);
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:
signals:
void new_decode_data();
private:
+ pv::SigSession &_session;
/**
* This mutex prevents more than one decode operation occuring
/**
* This mutex prevents more than one decode operation occuring
@@
-117,7
+138,14
@@
private:
std::list< boost::shared_ptr<decode::Decoder> > _stack;
std::list< boost::shared_ptr<decode::Decoder> > _stack;
- mutable boost::mutex _mutex;
+ 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;
int64_t _samples_decoded;
std::map<const decode::Row, decode::RowData> _rows;