X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=5755c80e11aa0dde925b50b5713457e08142d3fa;hb=628b45cc0ba7ac38ac6a003fedbbc746f15dd724;hp=29e8441a83785ee62628959d4676791f90456b27;hpb=f2f4845f15f5b5aa60cceb47c349201f44e1d14b;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 29e8441a..5755c80e 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -30,6 +30,7 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
 #include <pv/data/signalbase.hpp>
@@ -59,16 +60,26 @@ class LogicSegment;
 class SignalBase;
 class SignalData;
 
-struct DecodeChannel
+struct DecodeBinaryDataChunk
 {
-	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;
-	int initial_pin_state;
-	const shared_ptr<pv::data::decode::Decoder> decoder_;
-	const srd_channel *pdch_;
+	vector<uint8_t> data;
+	uint64_t sample;   ///< Number of the sample where this data was provided by the PD
+};
+
+struct DecodeBinaryClass
+{
+	const decode::Decoder* decoder;
+	const decode::DecodeBinaryClassInfo* info;
+	vector<DecodeBinaryDataChunk> chunks;
+};
+
+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;
+	vector<DecodeBinaryClass> binary_classes;
 };
 
 class DecodeSignal : public SignalBase
@@ -91,11 +102,14 @@ public:
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
-	void reset_decode();
+	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 vector<data::DecodeChannel> get_channels() const;
+	const vector<data::decode::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;
@@ -103,7 +117,7 @@ public:
 	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,
@@ -112,47 +126,89 @@ public:
 	 */
 	int64_t get_working_sample_count(uint32_t segment_id) const;
 
-	int64_t get_decoded_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;
+	vector<decode::Row> get_rows(bool visible_only) 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;
+
+	uint32_t get_binary_data_chunk_count(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint8_t bin_class_id) const;
+	void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec,
+		uint8_t bin_class_id, uint32_t chunk_id, const vector<uint8_t> **dest,
+		uint64_t *size);
+	void get_binary_data_chunks_merged(uint32_t segment_id, const data::decode::Decoder* dec,
+		uint8_t bin_class_id, uint64_t start_sample, uint64_t end_sample,
+		vector<uint8_t> *dest) const;
+	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint8_t bin_class_id) 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(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 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 start_srd_session();
+	void terminate_srd_session();
 	void stop_srd_session();
 
 	void connect_input_notifiers();
 
-	void create_new_annotation_segment();
+	void create_decode_segment();
+
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
+	static void binary_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
+	void decoder_stacked(void* decoder); ///< decoder is of type decode::Decoder*
+	void decoder_removed(void* decoder); ///< decoder is of type decode::Decoder*
 	void new_annotations(); // TODO Supply segment for which they belong to
+	void new_binary_data(unsigned int segment_id, void* decoder, unsigned int bin_class_id);
 	void decode_reset();
 	void decode_finished();
 	void channels_updated();
@@ -165,36 +221,30 @@ private Q_SLOTS:
 private:
 	pv::Session &session_;
 
-	vector<data::DecodeChannel> channels_;
+	vector<data::decode::DecodeChannel> channels_;
 
 	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_;
 
-	pv::util::Timestamp start_time_;
-	double samplerate_;
-
-	int64_t samples_decoded_;
-	uint32_t currently_processed_segment_;
-
 	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-	/// Annotations for all segments
-	vector< map<const decode::Row, decode::RowData>> segmented_rows_;
+	vector<DecodeSegment> segments_;
+	uint32_t current_segment_id_;
 
-	/// Set of annotations for current segment
-	map<const decode::Row, decode::RowData> *current_rows_;
-
-	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_, 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_;
 };