X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=a01ff3eea21ef4f00e2c6ec7b72061939e640cd2;hb=a82325d16a1412f3474423fa3fa56bb85af1fb00;hp=2d41e5003e57c391d492e80430b380cb22df2fc7;hpb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 2d41e500..a01ff3ee 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,10 @@ class LogicSegment;
 class SignalBase;
 class SignalData;
 
-struct DecodeChannel
+struct DecodeBinaryData
 {
-	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 DecodeSegment
@@ -76,7 +71,8 @@ struct DecodeSegment
 	map<const decode::Row, decode::RowData> annotation_rows;
 	pv::util::Timestamp start_time;
 	double samplerate;
-	int64_t samples_decoded;
+	int64_t samples_decoded_incl, samples_decoded_excl;
+	vector<DecodeBinaryData> binary_data;
 };
 
 class DecodeSignal : public SignalBase
@@ -101,9 +97,12 @@ public:
 
 	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;
@@ -120,18 +119,44 @@ 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, 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;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	virtual void restore_settings(QSettings &settings);
@@ -165,9 +190,11 @@ private:
 	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 new_annotations(); // TODO Supply segment for which they belong to
+	void new_binary_data(unsigned int segment_id);
 	void decode_reset();
 	void decode_finished();
 	void channels_updated();
@@ -180,7 +207,7 @@ private Q_SLOTS:
 private:
 	pv::Session &session_;
 
-	vector<data::DecodeChannel> channels_;
+	vector<data::decode::DecodeChannel> channels_;
 
 	struct srd_session *srd_session_;
 
@@ -195,12 +222,15 @@ private:
 	vector<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
 
-	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
-	mutable condition_variable decode_input_cond_, logic_mux_cond_;
+	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_;
 };