X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=f00a9f1cabaefc35de74ea66ede5544f15d99a56;hp=0f3a0330e3ad9029ad742d796294452d091f91ef;hb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;hpb=ecd07c20d34ce940163ac2e7fb26cb7ceac565bb diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 0f3a0330..f00a9f1c 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -20,19 +20,32 @@ #ifndef PULSEVIEW_PV_DATA_DECODESIGNAL_HPP #define PULSEVIEW_PV_DATA_DECODESIGNAL_HPP +#include +#include +#include #include +#include #include #include +#include +#include #include +#include -using std::list; +using std::atomic; +using std::condition_variable; +using std::map; +using std::mutex; +using std::pair; using std::vector; using std::shared_ptr; namespace pv { +class Session; + namespace data { namespace decode { @@ -41,46 +54,174 @@ class Decoder; class Row; } -class DecoderStack; class Logic; +class LogicSegment; +class SignalBase; class SignalData; +struct DecodeChannel +{ + 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_; +}; + +struct DecodeSegment +{ + map annotation_rows; + pv::util::Timestamp start_time; + double samplerate; + int64_t samples_decoded_incl, samples_decoded_excl; +}; + class DecodeSignal : public SignalBase { Q_OBJECT +private: + static const double DecodeMargin; + static const double DecodeThreshold; + static const int64_t DecodeChunkLength; + public: - DecodeSignal(shared_ptr decoder_stack); + DecodeSignal(pv::Session &session); virtual ~DecodeSignal(); bool is_decode_signal() const; - shared_ptr decoder_stack() const; - const list< shared_ptr >& decoder_stack_list() const; + const vector< shared_ptr >& decoder_stack() const; - void stack_decoder(srd_decoder *decoder); + void stack_decoder(const srd_decoder *decoder); void remove_decoder(int index); bool toggle_decoder_visibility(int index); + void reset_decode(bool shutting_down = false); + void begin_decode(); QString error_message() 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; + + void set_initial_pin_state(const uint16_t channel_id, const int init_state); + + double samplerate() const; + const pv::util::Timestamp start_time() const; + + /** + * Returns the number of samples that can be worked on, + * i.e. the number of samples where samples are available + * for all connected channels. + */ + int64_t get_working_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; /** - * 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, 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 &dest, + uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) 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(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(); + void terminate_srd_session(); + void stop_srd_session(); + + void connect_input_notifiers(); + + void create_decode_segment(); + + static void annotation_callback(srd_proto_data *pdata, void *decode_signal); + Q_SIGNALS: - void new_annotations(); + void new_annotations(); // TODO Supply segment for which they belong to + void decode_reset(); + void decode_finished(); + void channels_updated(); private Q_SLOTS: - void on_new_annotations(); + void on_capture_state_changed(int state); + void on_data_cleared(); + void on_data_received(); private: - shared_ptr decoder_stack_; + pv::Session &session_; + + vector channels_; + + struct srd_session *srd_session_; + + shared_ptr logic_mux_data_; + uint32_t logic_mux_unit_size_; + bool logic_mux_data_invalid_; + + vector< shared_ptr > stack_; + bool stack_config_changed_; + map, decode::Row> class_rows_; + + 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_; + + std::thread decode_thread_, logic_mux_thread_; + atomic decode_interrupt_, logic_mux_interrupt_; + + QString error_message_; }; } // namespace data