X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=9a112e9ba6342183b50a9c8c0678f492593ff27c;hb=f994f496908ed183c951ada303c4ba8d18b80b64;hp=9bbdd2c4e2c9d68e21d69782f5d2e78ecc0e7000;hpb=b82908abf7353c7401cd67e82325922960d5d546;p=pulseview.git diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 9bbdd2c4..9a112e9b 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -21,6 +21,7 @@ #define PULSEVIEW_PV_DATA_DECODESIGNAL_HPP #include +#include #include #include #include @@ -30,6 +31,7 @@ #include +#include #include #include #include @@ -37,6 +39,7 @@ using std::atomic; using std::condition_variable; +using std::deque; using std::map; using std::mutex; using std::pair; @@ -59,16 +62,17 @@ 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 decoder_; - const srd_channel *pdch_; + vector 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; + deque chunks; }; struct DecodeSegment @@ -77,6 +81,7 @@ struct DecodeSegment pv::util::Timestamp start_time; double samplerate; int64_t samples_decoded_incl, samples_decoded_excl; + vector binary_classes; }; class DecodeSignal : public SignalBase @@ -95,15 +100,18 @@ public: bool is_decode_signal() const; const vector< shared_ptr >& 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); 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 get_channels() const; + const vector get_channels() const; void auto_assign_signals(const shared_ptr dec); void assign_signal(const uint16_t channel_id, const SignalBase *signal); int get_assigned_signal_count() const; @@ -131,11 +139,13 @@ public: int64_t get_decoded_sample_count(uint32_t segment_id, bool include_processing) const; - vector visible_rows() const; + vector get_rows() const; + + uint64_t get_annotation_count(const decode::Row &row, uint32_t segment_id) const; /** - * Extracts annotations between the given sample range into a vector. - * Note: The annotations are unsorted and only annotations that fully + * 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( @@ -143,6 +153,31 @@ public: 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 &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, uint32_t bin_class_id) const; + void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec, + uint32_t bin_class_id, uint32_t chunk_id, const vector **dest, + uint64_t *size); + void get_merged_binary_data_chunks_by_sample(uint32_t segment_id, + const data::decode::Decoder* dec, uint32_t bin_class_id, + uint64_t start_sample, uint64_t end_sample, + vector *dest) const; + void get_merged_binary_data_chunks_by_offset(uint32_t segment_id, + const data::decode::Decoder* dec, uint32_t bin_class_id, + uint64_t start, uint64_t end, + vector *dest) const; + const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id, + const data::decode::Decoder* dec, uint32_t bin_class_id) const; + virtual void save_settings(QSettings &settings) const; virtual void restore_settings(QSettings &settings); @@ -176,9 +211,13 @@ 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 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(); @@ -191,7 +230,7 @@ private Q_SLOTS: private: pv::Session &session_; - vector channels_; + vector channels_; struct srd_session *srd_session_; @@ -206,12 +245,15 @@ private: vector 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 decode_interrupt_, logic_mux_interrupt_; + bool decode_paused_; + QString error_message_; };