struct DecodeChannel
{
- uint16_t id; // Also tells which bit within a sample represents this channel
+ 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;
* i.e. the number of samples where samples are available
* for all connected channels.
*/
- int64_t get_working_sample_count() const;
+ int64_t get_working_sample_count(uint32_t segment_id) const;
- int64_t get_decoded_sample_count() const;
+ int64_t get_decoded_sample_count(uint32_t segment_id) const;
vector<decode::Row> visible_rows() const;
void connect_input_notifiers();
+ void prepare_annotation_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();
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
- shared_ptr<LogicSegment> segment_;
+ shared_ptr<LogicSegment> logic_mux_segment_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;
double samplerate_;
int64_t samples_decoded_;
+ uint32_t currently_processed_segment_;
vector< shared_ptr<decode::Decoder> > stack_;
- map<const decode::Row, decode::RowData> rows_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
+ /// Annotations for all segments
+ vector< map<const decode::Row, decode::RowData>> rows_;
+
+ /// Set of annotations for current segment
+ map<const decode::Row, decode::RowData> *current_rows_; // TODO Multiple segment support
+
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
bool frame_complete_;