X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=bfbf5ee0644868856c9fb9cd9c86ec410e2cf42e;hp=cd0f6faa4b3e472a7b2ca70378b363ea0a60a5e8;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=c0c3e62a897ae31592855da7fbd0a6d0444c2581

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index cd0f6faa..bfbf5ee0 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -21,6 +21,7 @@
 #define PULSEVIEW_PV_DATA_DECODESIGNAL_HPP
 
 #include <atomic>
+#include <deque>
 #include <condition_variable>
 #include <unordered_set>
 #include <vector>
@@ -30,6 +31,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>
@@ -37,53 +39,55 @@
 
 using std::atomic;
 using std::condition_variable;
+using std::deque;
 using std::map;
 using std::mutex;
-using std::pair;
 using std::vector;
 using std::shared_ptr;
 
+using pv::data::decode::Annotation;
+using pv::data::decode::DecodeBinaryClassInfo;
+using pv::data::decode::DecodeChannel;
+using pv::data::decode::Decoder;
+using pv::data::decode::Row;
+using pv::data::decode::RowData;
+
 namespace pv {
 class Session;
 
 namespace data {
 
-namespace decode {
-class Annotation;
-class Decoder;
-class Row;
-}
-
 class Logic;
 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 DecodeBinaryData
+struct DecodeBinaryClass
 {
-	vector<uint8_t> data;
-	uint64_t sample;   ///< Number of the sample where this data was provided by the PD
+	const Decoder* decoder;
+	const DecodeBinaryClassInfo* info;
+	deque<DecodeBinaryDataChunk> chunks;
 };
 
 struct DecodeSegment
 {
-	map<const decode::Row, decode::RowData> annotation_rows;
+	// Constructor is a no-op
+	DecodeSegment() { };
+	// Copy constructor is a no-op
+	DecodeSegment(DecodeSegment&& ds) { (void)ds; };
+
+	map<const Row*, RowData> annotation_rows;  // Note: Row is the same for all segments while RowData is not
 	pv::util::Timestamp start_time;
 	double samplerate;
 	int64_t samples_decoded_incl, samples_decoded_excl;
-	vector<DecodeBinaryData> binary_data;
+	vector<DecodeBinaryClass> binary_classes;
+	deque<const Annotation*> all_annotations;
 };
 
 class DecodeSignal : public SignalBase
@@ -100,9 +104,9 @@ public:
 	virtual ~DecodeSignal();
 
 	bool is_decode_signal() const;
-	const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
+	const vector< shared_ptr<Decoder> >& decoder_stack() const;
 
-	void stack_decoder(const srd_decoder *decoder);
+	void stack_decoder(const srd_decoder *decoder, bool restart_decode=true);
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
@@ -113,14 +117,14 @@ public:
 	bool is_paused() const;
 	QString error_message() const;
 
-	const vector<data::DecodeChannel> get_channels() const;
-	void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
+	const vector<decode::DecodeChannel> get_channels() const;
+	void auto_assign_signals(const shared_ptr<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;
+	virtual double get_samplerate() const;
 	const pv::util::Timestamp start_time() const;
 
 	/**
@@ -141,32 +145,44 @@ public:
 	int64_t get_decoded_sample_count(uint32_t segment_id,
 		bool include_processing) const;
 
-	vector<decode::Row> get_rows(bool visible_only) const;
+	vector<Row*> get_rows(bool visible_only=false);
+	vector<const Row*> get_rows(bool visible_only=false) const;
+
+	uint64_t get_annotation_count(const Row* row, uint32_t segment_id) const;
 
 	/**
 	 * 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, uint32_t segment_id, uint64_t start_sample,
-		uint64_t end_sample) const;
+	void get_annotation_subset(deque<const Annotation*> &dest, const 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;
-	void get_binary_data_chunk(uint32_t segment_id, uint32_t chunk_id,
-		const vector<uint8_t> **dest, uint64_t *size);
-	void get_binary_data_chunks_merged(uint32_t segment_id,
-		uint64_t start_sample, uint64_t end_sample, vector<uint8_t> *dest) const;
+	void get_annotation_subset(deque<const 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 Decoder* dec, uint32_t bin_class_id) const;
+	void get_binary_data_chunk(uint32_t segment_id, const Decoder* dec,
+		uint32_t bin_class_id, uint32_t chunk_id, const vector<uint8_t> **dest,
+		uint64_t *size);
+	void get_merged_binary_data_chunks_by_sample(uint32_t segment_id,
+		const Decoder* dec, uint32_t bin_class_id,
+		uint64_t start_sample, uint64_t end_sample,
+		vector<uint8_t> *dest) const;
+	void get_merged_binary_data_chunks_by_offset(uint32_t segment_id,
+		const Decoder* dec, uint32_t bin_class_id,
+		uint64_t start, uint64_t end,
+		vector<uint8_t> *dest) const;
+	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
+		const Decoder* dec, uint32_t bin_class_id) const;
+
+	const deque<const Annotation*>* get_all_annotations_by_segment(uint32_t segment_id) const;
 
 	virtual void save_settings(QSettings &settings) const;
 
@@ -175,21 +191,21 @@ public:
 private:
 	void set_error_message(QString msg);
 
+	bool all_input_segments_complete(uint32_t segment_id) const;
 	uint32_t get_input_segment_count() const;
+	double get_input_samplerate(uint32_t segment_id) const;
 
-	uint32_t get_input_samplerate(uint32_t segment_id) const;
+	Decoder* get_decoder_by_instance(const srd_decoder *const srd_dec);
 
 	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();
@@ -204,21 +220,26 @@ private:
 	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(uint32_t segment_id);
+	void new_binary_data(unsigned int segment_id, void* decoder, unsigned int bin_class_id);
 	void decode_reset();
 	void decode_finished();
 	void channels_updated();
+	void annotation_visibility_changed();
 
 private Q_SLOTS:
 	void on_capture_state_changed(int state);
 	void on_data_cleared();
 	void on_data_received();
 
+	void on_annotation_visibility_changed();
+
 private:
 	pv::Session &session_;
 
-	vector<data::DecodeChannel> channels_;
+	vector<decode::DecodeChannel> channels_;
 
 	struct srd_session *srd_session_;
 
@@ -226,9 +247,8 @@ private:
 	uint32_t logic_mux_unit_size_;
 	bool logic_mux_data_invalid_;
 
-	vector< shared_ptr<decode::Decoder> > stack_;
+	vector< shared_ptr<Decoder> > stack_;
 	bool stack_config_changed_;
-	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
 	vector<DecodeSegment> segments_;
 	uint32_t current_segment_id_;