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 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;
+ 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()
{
out_of_memory_ = false;
+ {
+ lock_guard<recursive_mutex> lock(data_mutex_);
+ cur_logic_segment_.reset();
+ cur_analog_segments_.clear();
+ }
+ highest_segment_id_ = -1;
+
try {
device_->start();
} catch (Error e) {
}
}
+void Session::signal_new_segment()
+{
+ int new_segment_id = 0;
+
+ if ((cur_logic_segment_ != nullptr) || !cur_analog_segments_.empty()) {
+
+ // Determine new frame/segment number, assuming that all
+ // signals have the same number of frames/segments
+ if (cur_logic_segment_) {
+ new_segment_id = logic_data_->get_segment_count() - 1;
+ } else {
+ shared_ptr<sigrok::Channel> any_channel =
+ (*cur_analog_segments_.begin()).first;
+
+ shared_ptr<data::SignalBase> base = signalbase_from_channel(any_channel);
+ assert(base);
+
+ shared_ptr<data::Analog> data(base->analog_data());
+ assert(data);
+
+ new_segment_id = data->get_segment_count() - 1;
+ }
+ }
+
+ if (new_segment_id > highest_segment_id_) {
+ highest_segment_id_ = new_segment_id;
+ new_segment(highest_segment_id_);
+ }
+}
+
+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_begin()
{
frame_began_ = true;
-
- if (cur_logic_segment_ || !cur_analog_segments_.empty())
- frame_began();
}
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_) {
+ if (frame_began_)
frame_began_ = false;
- frame_ended();
- }
+
+ 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_);
- // @todo Putting this here means that only listeners querying
- // for logic will be notified. Currently the only user of
- // frame_began is DecoderStack, but in future we need to signal
- // this after both analog and logic sweeps have begun.
- frame_began();
+ signal_new_segment();
}
cur_logic_segment_->append_payload(logic);
const size_t sample_count = analog->num_samples() / channel_count;
bool sweep_beginning = false;
- unique_ptr<float> data(new float[analog->num_samples()]);
+ unique_ptr<float[]> data(new float[analog->num_samples()]);
analog->get_data_as_float(data.get());
if (signalbases_.empty())
// 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.
data->push_segment(segment);
+
+ signal_new_segment();
}
assert(segment);