X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=ba9c9b5e4ecaa8021b712446e487ede10a54eb6b;hp=2f7c273e978bfa2ec09618d89ddb1d273c1be676;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=ff83d98059f06ac8f57be080ab53e7095aa4748b

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 2f7c273e..ba9c9b5e 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -20,21 +20,32 @@
 #ifndef PULSEVIEW_PV_DATA_DECODESIGNAL_HPP
 #define PULSEVIEW_PV_DATA_DECODESIGNAL_HPP
 
+#include <atomic>
+#include <condition_variable>
 #include <unordered_set>
 #include <vector>
 
+#include <QSettings>
 #include <QString>
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <pv/data/decode/row.hpp>
+#include <pv/data/decode/rowdata.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/util.hpp>
 
-using std::list;
-using std::unordered_set;
+using std::atomic;
+using std::condition_variable;
+using std::map;
+using std::mutex;
+using std::pair;
 using std::vector;
 using std::shared_ptr;
 
 namespace pv {
+class Session;
+
 namespace data {
 
 namespace decode {
@@ -43,14 +54,15 @@ class Decoder;
 class Row;
 }
 
-class DecoderStack;
 class Logic;
+class LogicSegment;
 class SignalBase;
 class SignalData;
 
 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;
@@ -59,60 +71,163 @@ struct DecodeChannel
 	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_incl, samples_decoded_excl;
+};
+
 class DecodeSignal : public SignalBase
 {
 	Q_OBJECT
 
+private:
+	static const double DecodeMargin;
+	static const double DecodeThreshold;
+	static const int64_t DecodeChunkLength;
+
 public:
-	DecodeSignal(shared_ptr<pv::data::DecoderStack> decoder_stack,
-		const unordered_set< shared_ptr<data::SignalBase> > &all_signals);
+	DecodeSignal(pv::Session &session);
 	virtual ~DecodeSignal();
 
 	bool is_decode_signal() const;
-	shared_ptr<data::DecoderStack> decoder_stack() const;
-	const list< shared_ptr<data::decode::Decoder> >& decoder_stack_list() 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 reset_decode(bool shutting_down = false);
+	void begin_decode();
+	void pause_decode();
+	void resume_decode();
+	bool is_paused() const;
 	QString error_message() const;
 
-	const list<data::DecodeChannel> get_channels() const;
-	void auto_assign_signals();
+	const vector<data::DecodeChannel> get_channels() const;
+	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 set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
 	double samplerate() const;
-	const pv::util::Timestamp& start_time() const;
-	int64_t sample_count() const;
-	int64_t samples_decoded() 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.
+	 */
+	int64_t get_working_sample_count(uint32_t segment_id) const;
+
+	/**
+	 * Returns the number of processed samples. Newly generated annotations will
+	 * have sample numbers greater than this.
+	 *
+	 * If include_processing is true, this number will include the ones being
+	 * currently processed (in case the decoder stack is running). In this case,
+	 * newly generated annotations will have sample numbers smaller than this.
+	 */
+	int64_t get_decoded_sample_count(uint32_t segment_id,
+		bool include_processing) const;
 
 	vector<decode::Row> visible_rows() const;
 
 	/**
-	 * Extracts sorted annotations between two period into a vector.
+	 * Extracts annotations from a single row into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
+	 * fit into the sample range are considered.
 	 */
 	void get_annotation_subset(
 		vector<pv::data::decode::Annotation> &dest,
-		const decode::Row &row, uint64_t start_sample,
+		const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
 		uint64_t end_sample) const;
 
+	/**
+	 * Extracts annotations from all rows into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
+	 * fit into the sample range are considered.
+	 */
+	void get_annotation_subset(
+		vector<pv::data::decode::Annotation> &dest,
+		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
+
+	virtual void save_settings(QSettings &settings) const;
+
+	virtual void restore_settings(QSettings &settings);
+
 private:
+	void set_error_message(QString msg);
+
+	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 mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end);
+
+	void logic_mux_proc();
+
+	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+		const shared_ptr<LogicSegment> input_segment);
+
+	void decode_proc();
+
+	void start_srd_session();
+	void terminate_srd_session();
+	void stop_srd_session();
+
+	void connect_input_notifiers();
+
+	void create_decode_segment();
+
+	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();
 
 private Q_SLOTS:
-	void on_new_annotations();
+	void on_capture_state_changed(int state);
+	void on_data_cleared();
+	void on_data_received();
 
 private:
-	shared_ptr<pv::data::DecoderStack> decoder_stack_;
-	const unordered_set< shared_ptr<data::SignalBase> > &all_signals_;
-	list<data::DecodeChannel> channels_;
+	pv::Session &session_;
+
+	vector<data::DecodeChannel> channels_;
+
+	struct srd_session *srd_session_;
+
+	shared_ptr<Logic> logic_mux_data_;
+	uint32_t logic_mux_unit_size_;
+	bool logic_mux_data_invalid_;
+
+	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
+	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
+
+	vector<DecodeSegment> segments_;
+	uint32_t current_segment_id_;
+
+	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
+	mutable condition_variable decode_input_cond_, decode_pause_cond_,
+		logic_mux_cond_;
+
+	std::thread decode_thread_, logic_mux_thread_;
+	atomic<bool> decode_interrupt_, logic_mux_interrupt_;
+
+	bool decode_paused_;
+
+	QString error_message_;
 };
 
 } // namespace data