projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Begin PD multisegment support
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index d50aace9c2dc841fe62c5b820dcd9aa8a4bd22e0..0a28fe3c5324eba3fcaf230910a38071c06f578b 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-40,7
+40,6
@@
using std::condition_variable;
using std::map;
using std::mutex;
using std::pair;
using std::map;
using std::mutex;
using std::pair;
-using std::unordered_set;
using std::vector;
using std::shared_ptr;
using std::vector;
using std::shared_ptr;
@@
-62,7
+61,8
@@
class SignalData;
struct DecodeChannel
{
struct DecodeChannel
{
- uint16_t id; // Also tells which bit within a sample represents this channel
+ uint16_t id; ///< Global numerical ID for the decode channels in the stack
+ uint16_t bit_id; ///< Tells which bit within a sample represents this channel
const bool is_optional;
const pv::data::SignalBase *assigned_signal;
const QString name, desc;
const bool is_optional;
const pv::data::SignalBase *assigned_signal;
const QString name, desc;
@@
-96,7
+96,7
@@
public:
QString error_message() const;
const vector<data::DecodeChannel> get_channels() const;
QString error_message() const;
const vector<data::DecodeChannel> get_channels() const;
- void auto_assign_signals();
+ void auto_assign_signals(
const shared_ptr<pv::data::decode::Decoder> dec
);
void assign_signal(const uint16_t channel_id, const SignalBase *signal);
int get_assigned_signal_count() const;
void assign_signal(const uint16_t channel_id, const SignalBase *signal);
int get_assigned_signal_count() const;
@@
-110,9
+110,9
@@
public:
* i.e. the number of samples where samples are available
* for all connected channels.
*/
* 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;
@@
-148,10
+148,12
@@
private:
void connect_input_notifiers();
void connect_input_notifiers();
+ void prepare_annotation_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_finished();
void channels_updated();
@@
-168,18
+170,24
@@
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> segment_;
+ shared_ptr<LogicSegment>
logic_mux_
segment_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;
double samplerate_;
int64_t samples_decoded_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;
double samplerate_;
int64_t samples_decoded_;
+ uint32_t currently_processed_segment_;
vector< shared_ptr<decode::Decoder> > stack_;
vector< shared_ptr<decode::Decoder> > stack_;
- map<const decode::Row, decode::RowData> rows_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
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_; // TODO Multiple segment support
+
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
bool frame_complete_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
bool frame_complete_;