X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=51745b7baab8a8d3bf1237e80d9fa96bb10a458e;hp=e591eb010bfb007f357f5c28b5961f1ac822669c;hb=f54e68b03d5d24c7787962fcc701d8d52b0ec8ab;hpb=c8a6db0e46202d49b47158e902e1afb8b1d5fbcf diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index e591eb01..51745b7b 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -42,21 +42,21 @@ 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; @@ -70,18 +70,24 @@ struct DecodeBinaryDataChunk struct DecodeBinaryClass { - const decode::Decoder* decoder; - const decode::DecodeBinaryClassInfo* info; + 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; pv::util::Timestamp start_time; double samplerate; int64_t samples_decoded_incl, samples_decoded_excl; vector binary_classes; + deque all_annotations; }; class DecodeSignal : public SignalBase @@ -98,9 +104,9 @@ 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); @@ -111,8 +117,8 @@ public: 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; @@ -139,37 +145,44 @@ public: int64_t get_decoded_sample_count(uint32_t segment_id, bool include_processing) const; - vector get_rows(bool visible_only) 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 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( - vector &dest, - uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; + 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 data::decode::Decoder* dec, uint32_t bin_class_id) const; - void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec, + 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_binary_data_chunks_merged(uint32_t segment_id, const data::decode::Decoder* dec, - uint32_t bin_class_id, uint64_t start_sample, uint64_t end_sample, + 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 data::decode::Decoder* dec, uint32_t bin_class_id) const; + 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; @@ -179,20 +192,19 @@ private: 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(); @@ -223,7 +235,7 @@ private Q_SLOTS: private: pv::Session &session_; - vector channels_; + vector channels_; struct srd_session *srd_session_; @@ -231,9 +243,8 @@ private: uint32_t logic_mux_unit_size_; bool logic_mux_data_invalid_; - vector< shared_ptr > stack_; + vector< shared_ptr > stack_; bool stack_config_changed_; - map, decode::Row> class_rows_; vector segments_; uint32_t current_segment_id_;