projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust signal to changes made in 7f894d958
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index dd2ad79dbb790f0553220fe34fbb211ba710ca2f..b4f9a2cb0eb3da2795a6299879466c01ac91a724 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-71,6
+71,14
@@
struct DecodeChannel
const srd_channel *pdch_;
};
const srd_channel *pdch_;
};
+struct DecodeSegment
+{
+ map<const decode::Row, decode::RowData> annotation_rows;
+ pv::util::Timestamp start_time;
+ double samplerate;
+ int64_t samples_decoded;
+};
+
class DecodeSignal : public SignalBase
{
Q_OBJECT
class DecodeSignal : public SignalBase
{
Q_OBJECT
@@
-103,16
+111,16
@@
public:
void set_initial_pin_state(const uint16_t channel_id, const int init_state);
double samplerate() const;
void set_initial_pin_state(const uint16_t channel_id, const int init_state);
double samplerate() const;
- const pv::util::Timestamp
&
start_time() const;
+ const pv::util::Timestamp start_time() const;
/**
* Returns the number of samples that can be worked on,
* i.e. the number of samples where samples are available
* for all connected channels.
*/
/**
* Returns the number of samples that can be worked on,
* i.e. the number of samples where samples are available
* for all connected channels.
*/
- int64_t get_working_sample_count() const;
+ int64_t get_working_sample_count(
uint32_t segment_id
) const;
- int64_t get_decoded_sample_count() const;
+ int64_t get_decoded_sample_count(
uint32_t segment_id
) const;
vector<decode::Row> visible_rows() const;
vector<decode::Row> visible_rows() const;
@@
-121,7
+129,7
@@
public:
*/
void get_annotation_subset(
vector<pv::data::decode::Annotation> &dest,
*/
void get_annotation_subset(
vector<pv::data::decode::Annotation> &dest,
- const decode::Row &row, uint64_t start_sample,
+ const decode::Row &row, uint
32_t segment_id, uint
64_t start_sample,
uint64_t end_sample) const;
virtual void save_settings(QSettings &settings) const;
uint64_t end_sample) const;
virtual void save_settings(QSettings &settings) const;
@@
-129,17
+137,20
@@
public:
virtual void restore_settings(QSettings &settings);
private:
virtual void restore_settings(QSettings &settings);
private:
+ uint32_t get_input_segment_count() const;
+
+ uint32_t get_input_samplerate(uint32_t segment_id) const;
+
void update_channel_list();
void commit_decoder_channels();
void update_channel_list();
void commit_decoder_channels();
- void mux_logic_samples(const int64_t start, const int64_t end);
+ void mux_logic_samples(
uint32_t segment_id,
const int64_t start, const int64_t end);
void logic_mux_proc();
void logic_mux_proc();
- void query_input_metadata();
-
- void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+ void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+ const shared_ptr<LogicSegment> input_segment);
void decode_proc();
void decode_proc();
@@
-148,11
+159,12
@@
private:
void connect_input_notifiers();
void connect_input_notifiers();
- void prepare_annotation_segment();
+ void create_decode_segment();
+
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
- void new_annotations();
+ void new_annotations();
// TODO Supply segment for which they belong to
void decode_reset();
void decode_finished();
void channels_updated();
void decode_reset();
void decode_finished();
void channels_updated();
@@
-170,26
+182,17
@@
private:
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
-
shared_ptr<LogicSegment> logic_mux_segment
_;
+
uint32_t logic_mux_unit_size
_;
bool logic_mux_data_invalid_;
bool logic_mux_data_invalid_;
- pv::util::Timestamp start_time_;
- double samplerate_;
-
- int64_t samples_decoded_;
-
vector< shared_ptr<decode::Decoder> > stack_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
vector< shared_ptr<decode::Decoder> > stack_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
- /// Annotations for all segments
- vector< map<const decode::Row, decode::RowData>> rows_;
-
- /// Set of annotations for current segment
- map<const decode::Row, decode::RowData> *current_rows_;
+ vector<DecodeSegment> segments_;
+ uint32_t current_segment_id_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
- bool frame_complete_;
std::thread decode_thread_, logic_mux_thread_;
atomic<bool> decode_interrupt_, logic_mux_interrupt_;
std::thread decode_thread_, logic_mux_thread_;
atomic<bool> decode_interrupt_, logic_mux_interrupt_;