projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Fix flawed PD stack restoration
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 8d0a29f475d4439dfa166f0fcb6e17bf10b30239..0e0911521b09973ed2d28fd1ca72efa1f139b0df 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;
@@
-79,7
+78,6
@@
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:
DecodeSignal(pv::Session &session);
public:
DecodeSignal(pv::Session &session);
@@
-88,7
+86,7
@@
public:
bool is_decode_signal() const;
const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
bool is_decode_signal() const;
const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
- void stack_decoder(srd_decoder *decoder);
+ void stack_decoder(
const
srd_decoder *decoder);
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
@@
-97,7
+95,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;
@@
-129,13
+127,6
@@
public:
virtual void restore_settings(QSettings &settings);
virtual void restore_settings(QSettings &settings);
- /**
- * Helper function for static annotation_callback(),
- * must be public so the function can access it.
- * Don't use from outside this class.
- */
- uint64_t inc_annotation_count();
-
private:
void update_channel_list();
private:
void update_channel_list();
@@
-145,6
+136,8
@@
private:
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_proc();
void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
void decode_proc();
@@
-152,16
+145,19
@@
private:
void start_srd_session();
void stop_srd_session();
void start_srd_session();
void stop_srd_session();
+ void connect_input_notifiers();
+
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
void new_annotations();
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
void new_annotations();
+ void decode_finished();
void channels_updated();
private Q_SLOTS:
void on_capture_state_changed(int state);
void channels_updated();
private Q_SLOTS:
void on_capture_state_changed(int state);
+ void on_data_cleared();
void on_data_received();
void on_data_received();
- void on_frame_ended();
private:
pv::Session &session_;
private:
pv::Session &session_;
@@
-177,20
+173,12
@@
private:
pv::util::Timestamp start_time_;
double samplerate_;
pv::util::Timestamp start_time_;
double samplerate_;
- int64_t
annotation_count_,
samples_decoded_;
+ int64_t samples_decoded_;
vector< shared_ptr<decode::Decoder> > stack_;
map<const decode::Row, decode::RowData> rows_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
vector< shared_ptr<decode::Decoder> > stack_;
map<const decode::Row, decode::RowData> rows_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
- /**
- * This mutex prevents more than one thread from accessing
- * libsigrokdecode concurrently.
- * @todo A proper solution should be implemented to allow multiple
- * decode operations in parallel.
- */
- static mutex global_srd_mutex_;
-
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_;