return samplerate;
}
-int Session::get_segment_count() const
+uint32_t Session::get_segment_count() const
{
- int min_val = INT_MAX;
+ uint32_t value = 0;
- // Find the lowest common number of segments
+ // Find the highest number of segments
for (shared_ptr<data::SignalData> data : all_signal_data_)
- if (data->get_segment_count() < min_val)
- min_val = data->get_segment_count();
+ if (data->get_segment_count() > value)
+ value = data->get_segment_count();
- return (min_val != INT_MAX) ? min_val : 0;
+ return value;
}
const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
return signalbases_;
}
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+ bool all_complete = true;
+
+ for (shared_ptr<data::SignalBase> base : signalbases_)
+ if (!base->segment_is_complete(segment_id))
+ all_complete = false;
+
+ return all_complete;
+}
+
#ifdef ENABLE_DECODE
shared_ptr<data::DecodeSignal> Session::add_decode_signal()
{
}
}
+void Session::signal_segment_completed()
+{
+ int segment_id = 0;
+
+ for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
+ // We only care about analog and logic channels, not derived ones
+ if (signalbase->type() == data::SignalBase::AnalogChannel) {
+ segment_id = signalbase->analog_data()->get_segment_count() - 1;
+ break;
+ }
+
+ if (signalbase->type() == data::SignalBase::LogicChannel) {
+ segment_id = signalbase->logic_data()->get_segment_count() - 1;
+ break;
+ }
+ }
+
+ if (segment_id >= 0)
+ segment_completed(segment_id);
+}
+
void Session::feed_in_header()
{
// Nothing to do here for now
void Session::feed_in_frame_end()
{
+ if (!frame_began_)
+ return;
+
{
lock_guard<recursive_mutex> lock(data_mutex_);
+
+ if (cur_logic_segment_)
+ cur_logic_segment_->set_complete();
+
+ for (auto entry : cur_analog_segments_) {
+ shared_ptr<data::AnalogSegment> segment = entry.second;
+ segment->set_complete();
+ }
+
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
if (frame_began_)
frame_began_ = false;
+
+ signal_segment_completed();
}
void Session::feed_in_logic(shared_ptr<Logic> logic)
// Create a new data segment
cur_logic_segment_ = make_shared<data::LogicSegment>(
- *logic_data_, logic->unit_size(), cur_samplerate_);
+ *logic_data_, logic_data_->get_segment_count(),
+ logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
signal_new_segment();
// Create a segment, keep it in the maps of channels
segment = make_shared<data::AnalogSegment>(
- *data, cur_samplerate_);
+ *data, data->get_segment_count(), cur_samplerate_);
cur_analog_segments_[channel] = segment;
// Push the segment into the analog data.