X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=2a6d125f06024dd14494097f834a00d6f44bd8fc;hp=4f2253d1716091e8a231a8be702a9d5cf0c79cec;hb=02078aa15a4747b8ab7a91d54e2e141c3acb5628;hpb=ce0b6a40ca6f804fd6ae7dcce2bbe163848819aa diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 4f2253d1..2a6d125f 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,46 +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 +{ + vector data; + uint64_t sample; ///< Number of the sample where this data was provided by the PD +}; + +struct DecodeBinaryClass { - 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_; + const Decoder* decoder; + const DecodeBinaryClassInfo* info; + deque chunks; }; struct DecodeSegment { - map annotation_rows; + // Constructor is a no-op + DecodeSegment() { }; + // Copy constructor is a no-op + DecodeSegment(DecodeSegment&& ds) { (void)ds; }; + + map 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; + int64_t samples_decoded_incl, samples_decoded_excl; + vector binary_classes; + deque all_annotations; }; class DecodeSignal : public SignalBase @@ -93,24 +104,27 @@ public: virtual ~DecodeSignal(); bool is_decode_signal() const; - const vector< shared_ptr >& decoder_stack() 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(); + 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; - void auto_assign_signals(const shared_ptr dec); + 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; 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; /** @@ -120,38 +134,77 @@ 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 visible_rows() const; + vector get_rows(bool visible_only=false); + vector get_rows(bool visible_only=false) const; + + uint64_t get_annotation_count(const Row* row, uint32_t segment_id) 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 &dest, - const decode::Row &row, uint32_t segment_id, uint64_t start_sample, - uint64_t end_sample) const; + void get_annotation_subset(deque &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(deque &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 **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 *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 *dest) const; + const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id, + const Decoder* dec, uint32_t bin_class_id) const; + + const deque* get_all_annotations_by_segment(uint32_t segment_id) const; virtual void save_settings(QSettings &settings) const; virtual void restore_settings(QSettings &settings); private: - uint32_t get_input_segment_count() const; + void set_error_message(QString msg); + uint32_t get_input_segment_count() 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 input_segment); - void decode_proc(); void start_srd_session(); @@ -163,22 +216,29 @@ 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(); + 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 channels_; + vector channels_; struct srd_session *srd_session_; @@ -186,18 +246,21 @@ private: uint32_t logic_mux_unit_size_; bool logic_mux_data_invalid_; - vector< shared_ptr > stack_; - map, decode::Row> class_rows_; + vector< shared_ptr > stack_; + bool stack_config_changed_; 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_; };