* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <QDebug>
-#include <QFileInfo>
-
#include <cassert>
#include <memory>
#include <mutex>
#include <sys/stat.h>
+#include <QDebug>
+#include <QFileInfo>
+
#include "devicemanager.hpp"
#include "mainwindow.hpp"
#include "session.hpp"
+#include "util.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
+
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#include "data/decodesignal.hpp"
using std::dynamic_pointer_cast;
using std::find_if;
using std::function;
-using std::lock_guard;
using std::list;
+using std::lock_guard;
using std::make_pair;
using std::make_shared;
using std::map;
using std::runtime_error;
using std::shared_ptr;
using std::string;
+#ifdef ENABLE_FLOW
+using std::unique_lock;
+#endif
using std::unique_ptr;
-using std::unordered_set;
using std::vector;
using sigrok::Analog;
using Glib::VariantBase;
+#ifdef ENABLE_FLOW
+using Gst::Bus;
+using Gst::ElementFactory;
+using Gst::Pipeline;
+#endif
+
+using pv::util::Timestamp;
+using pv::views::trace::Signal;
+using pv::views::trace::AnalogSignal;
+using pv::views::trace::LogicSignal;
+
namespace pv {
shared_ptr<sigrok::Context> Session::sr_context;
name_changed();
}
-const list< shared_ptr<views::ViewBase> > Session::views() const
+const vector< shared_ptr<views::ViewBase> > Session::views() const
{
return views_;
}
return data_saved_;
}
+void Session::save_setup(QSettings &settings) const
+{
+ int i = 0;
+
+ // Save channels and decoders
+ for (const shared_ptr<data::SignalBase>& base : signalbases_) {
+#ifdef ENABLE_DECODE
+ if (base->is_decode_signal()) {
+ settings.beginGroup("decode_signal" + QString::number(i++));
+ base->save_settings(settings);
+ settings.endGroup();
+ } else
+#endif
+ {
+ settings.beginGroup(base->internal_name());
+ base->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("decode_signals", i);
+
+ // Save view states and their signal settings
+ // Note: main_view must be saved as view0
+ i = 0;
+ settings.beginGroup("view" + QString::number(i++));
+ main_view_->save_settings(settings);
+ settings.endGroup();
+
+ for (const shared_ptr<views::ViewBase>& view : views_) {
+ if (view != main_view_) {
+ settings.beginGroup("view" + QString::number(i++));
+ settings.setValue("type", view->get_type());
+ view->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("views", i);
+
+ int view_id = 0;
+ i = 0;
+ for (const shared_ptr<views::ViewBase>& vb : views_) {
+ shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(vb);
+ if (tv) {
+ for (const shared_ptr<views::trace::TimeItem>& time_item : tv->time_items()) {
+
+ const shared_ptr<views::trace::Flag> flag =
+ dynamic_pointer_cast<views::trace::Flag>(time_item);
+ if (flag) {
+ if (!flag->enabled())
+ continue;
+
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "time_marker");
+ settings.setValue("assoc_view", view_id);
+ GlobalSettings::store_timestamp(settings, "time", flag->time());
+ settings.setValue("text", flag->get_text());
+ settings.endGroup();
+ }
+ }
+
+ if (tv->cursors_shown()) {
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "selection");
+ settings.setValue("assoc_view", view_id);
+ const shared_ptr<views::trace::CursorPair> cp = tv->cursors();
+ GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
+ GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
+ settings.endGroup();
+ }
+ }
+
+ view_id++;
+ }
+
+ settings.setValue("meta_objs", i);
+}
+
void Session::save_settings(QSettings &settings) const
{
map<string, string> dev_info;
list<string> key_list;
- int decode_signals = 0, views = 0;
if (device_) {
shared_ptr<devices::HardwareDevice> hw_device =
dev_info = device_manager_.get_device_info(device_);
- for (string key : key_list) {
+ for (string& key : key_list) {
if (dev_info.count(key))
settings.setValue(QString::fromUtf8(key.c_str()),
QString::fromUtf8(dev_info.at(key).c_str()));
settings.endGroup();
}
- // Save channels and decoders
- for (shared_ptr<data::SignalBase> base : signalbases_) {
+ save_setup(settings);
+ }
+}
+
+void Session::restore_setup(QSettings &settings)
+{
+ // Restore channels
+ for (shared_ptr<data::SignalBase> base : signalbases_) {
+ settings.beginGroup(base->internal_name());
+ base->restore_settings(settings);
+ settings.endGroup();
+ }
+
+ // Restore decoders
#ifdef ENABLE_DECODE
- if (base->is_decode_signal()) {
- settings.beginGroup("decode_signal" + QString::number(decode_signals++));
- base->save_settings(settings);
- settings.endGroup();
- } else
+ int decode_signals = settings.value("decode_signals").toInt();
+
+ for (int i = 0; i < decode_signals; i++) {
+ settings.beginGroup("decode_signal" + QString::number(i));
+ shared_ptr<data::DecodeSignal> signal = add_decode_signal();
+ signal->restore_settings(settings);
+ settings.endGroup();
+ }
#endif
- {
- settings.beginGroup(base->internal_name());
- base->save_settings(settings);
- settings.endGroup();
- }
- }
- settings.setValue("decode_signals", decode_signals);
+ // Restore views
+ int views = settings.value("views").toInt();
+
+ for (int i = 0; i < views; i++) {
+ settings.beginGroup("view" + QString::number(i));
+
+ if (i > 0) {
+ views::ViewType type = (views::ViewType)settings.value("type").toInt();
+ add_view(type, this);
+ views_.back()->restore_settings(settings);
+ } else
+ main_view_->restore_settings(settings);
- // Save view states and their signal settings
- // Note: main_view must be saved as view0
- settings.beginGroup("view" + QString::number(views++));
- main_view_->save_settings(settings);
settings.endGroup();
+ }
- for (shared_ptr<views::ViewBase> view : views_) {
- if (view != main_view_) {
- settings.beginGroup("view" + QString::number(views++));
- view->save_settings(settings);
- settings.endGroup();
- }
+ // Restore meta objects like markers and cursors
+ int meta_objs = settings.value("meta_objs").toInt();
+
+ for (int i = 0; i < meta_objs; i++) {
+ settings.beginGroup("meta_obj" + QString::number(i));
+
+ shared_ptr<views::ViewBase> vb;
+ shared_ptr<views::trace::View> tv;
+ if (settings.contains("assoc_view"))
+ vb = views_.at(settings.value("assoc_view").toInt());
+
+ if (vb)
+ tv = dynamic_pointer_cast<views::trace::View>(vb);
+
+ const QString type = settings.value("type").toString();
+
+ if ((type == "time_marker") && tv) {
+ Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
+ shared_ptr<views::trace::Flag> flag = tv->add_flag(ts);
+ flag->set_text(settings.value("text").toString());
+ }
+
+ if ((type == "selection") && tv) {
+ Timestamp start = GlobalSettings::restore_timestamp(settings, "start_time");
+ Timestamp end = GlobalSettings::restore_timestamp(settings, "end_time");
+ tv->set_cursors(start, end);
+ tv->show_cursors();
}
- settings.setValue("views", views);
+ settings.endGroup();
}
}
{
shared_ptr<devices::Device> device;
- QString device_type = settings.value("device_type").toString();
+ const QString device_type = settings.value("device_type").toString();
if (device_type == "hardware") {
map<string, string> dev_info;
if ((device_type == "sessionfile") || (device_type == "inputfile")) {
if (device_type == "sessionfile") {
settings.beginGroup("device");
- QString filename = settings.value("filename").toString();
+ const QString filename = settings.value("filename").toString();
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
}
}
- if (device) {
- // Restore channels
- for (shared_ptr<data::SignalBase> base : signalbases_) {
- settings.beginGroup(base->internal_name());
- base->restore_settings(settings);
- settings.endGroup();
- }
-
- // Restore decoders
-#ifdef ENABLE_DECODE
- int decode_signals = settings.value("decode_signals").toInt();
-
- for (int i = 0; i < decode_signals; i++) {
- settings.beginGroup("decode_signal" + QString::number(i));
- shared_ptr<data::DecodeSignal> signal = add_decode_signal();
- signal->restore_settings(settings);
- settings.endGroup();
- }
-#endif
-
- // Restore views
- int views = settings.value("views").toInt();
-
- for (int i = 0; i < views; i++) {
- settings.beginGroup("view" + QString::number(i));
-
- if (i > 0) {
- views::ViewType type = (views::ViewType)settings.value("type").toInt();
- add_view(name_, type, this);
- views_.back()->restore_settings(settings);
- } else
- main_view_->restore_settings(settings);
-
- settings.endGroup();
- }
- }
+ if (device)
+ restore_setup(settings);
}
void Session::select_device(shared_ptr<devices::Device> device)
#endif
view->reset_view_state();
}
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ for (const shared_ptr<data::SignalData>& d : all_signal_data_)
d->clear();
all_signal_data_.clear();
signalbases_.clear();
cur_logic_segment_.reset();
- for (auto entry : cur_analog_segments_) {
+ for (auto& entry : cur_analog_segments_) {
shared_ptr<sigrok::Channel>(entry.first).reset();
shared_ptr<data::AnalogSegment>(entry.second).reset();
}
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+bool Session::using_file_device() const
+{
+ shared_ptr<devices::SessionFile> sessionfile_device =
+ dynamic_pointer_cast<devices::SessionFile>(device_);
+
+ shared_ptr<devices::InputFile> inputfile_device =
+ dynamic_pointer_cast<devices::InputFile>(device_);
+
+ return (sessionfile_device || inputfile_device);
+}
+
/**
* Convert generic options to data types that are specific to InputFormat.
*
{
map<string, Glib::VariantBase> result;
- for (auto entry : user_spec) {
+ for (auto& entry : user_spec) {
/*
* Split key=value specs. Accept entries without separator
* (for simplified boolean specifications).
return result;
}
-void Session::load_init_file(const string &file_name, const string &format)
+void Session::load_init_file(const string &file_name,
+ const string &format, const string &setup_file_name)
{
shared_ptr<InputFormat> input_format;
map<string, Glib::VariantBase> input_opts;
input_format->options());
}
- load_file(QString::fromStdString(file_name), input_format, input_opts);
+ load_file(QString::fromStdString(file_name), QString::fromStdString(setup_file_name),
+ input_format, input_opts);
}
-void Session::load_file(QString file_name,
- shared_ptr<sigrok::InputFormat> format,
- const map<string, Glib::VariantBase> &options)
+void Session::load_file(QString file_name, QString setup_file_name,
+ shared_ptr<sigrok::InputFormat> format, const map<string, Glib::VariantBase> &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
device_manager_.context(),
file_name.toStdString())));
} catch (Error& e) {
- MainWindow::show_session_error(tr("Failed to load ") + file_name, e.what());
+ MainWindow::show_session_error(tr("Failed to load %1").arg(file_name), e.what());
set_default_device();
main_bar_->update_device_list();
return;
}
+ // Use the input file with .pvs extension if no setup file was given
+ if (setup_file_name.isEmpty()) {
+ setup_file_name = file_name;
+ setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+ setup_file_name.append(".pvs");
+ }
+
+ if (QFileInfo::exists(setup_file_name) && QFileInfo(setup_file_name).isReadable()) {
+ QSettings settings_storage(setup_file_name, QSettings::IniFormat);
+ restore_setup(settings_storage);
+ }
+
main_bar_->update_device_list();
start_capture([&, errorMessage](QString infoMessage) {
}
// Clear signal data
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ for (const shared_ptr<data::SignalData>& d : all_signal_data_)
d->clear();
trigger_list_.clear();
void Session::register_view(shared_ptr<views::ViewBase> view)
{
- if (views_.empty()) {
+ if (views_.empty())
main_view_ = view;
- }
views_.push_back(view);
update_signals();
// Add all other signals
- unordered_set< shared_ptr<data::SignalBase> > view_signalbases =
- view->signalbases();
-
- views::trace::View *trace_view =
- qobject_cast<views::trace::View*>(view.get());
-
- if (trace_view) {
- for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
- const int sb_exists = count_if(
- view_signalbases.cbegin(), view_signalbases.cend(),
- [&](const shared_ptr<data::SignalBase> &sb) {
- return sb == signalbase;
- });
- // Add the signal to the view as it doesn't have it yet
- if (!sb_exists)
- switch (signalbase->type()) {
- case data::SignalBase::AnalogChannel:
- case data::SignalBase::LogicChannel:
- case data::SignalBase::DecodeChannel:
+ vector< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+
+ for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
+ const int sb_exists = count_if(
+ view_signalbases.cbegin(), view_signalbases.cend(),
+ [&](const shared_ptr<data::SignalBase> &sb) {
+ return sb == signalbase;
+ });
+
+ // Add the signal to the view if it doesn't have it yet
+ if (!sb_exists)
+ switch (signalbase->type()) {
+ case data::SignalBase::AnalogChannel:
+ case data::SignalBase::LogicChannel:
+ case data::SignalBase::MathChannel:
+ view->add_signalbase(signalbase);
+ break;
+ case data::SignalBase::DecodeChannel:
#ifdef ENABLE_DECODE
- trace_view->add_decode_signal(
- dynamic_pointer_cast<data::DecodeSignal>(signalbase));
+ view->add_decode_signal(dynamic_pointer_cast<data::DecodeSignal>(signalbase));
#endif
- break;
- case data::SignalBase::MathChannel:
- // TBD
- break;
- }
- }
+ break;
+ }
}
signals_changed();
void Session::deregister_view(shared_ptr<views::ViewBase> view)
{
- views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
+ views_.erase(std::remove_if(views_.begin(), views_.end(),
+ [&](shared_ptr<views::ViewBase> v) { return v == view; }),
+ views_.end());
if (views_.empty()) {
main_view_.reset();
bool Session::has_view(shared_ptr<views::ViewBase> view)
{
- for (shared_ptr<views::ViewBase> v : views_)
+ for (shared_ptr<views::ViewBase>& v : views_)
if (v == view)
return true;
{
double samplerate = 0.0;
- for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ for (const shared_ptr<pv::data::SignalData>& d : all_signal_data_) {
assert(d);
const vector< shared_ptr<pv::data::Segment> > segments =
d->segments();
- for (const shared_ptr<pv::data::Segment> &s : segments)
+ for (const shared_ptr<pv::data::Segment>& s : segments)
samplerate = max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
uint32_t value = 0;
// Find the highest number of segments
- for (shared_ptr<data::SignalData> data : all_signal_data_)
+ for (const shared_ptr<data::SignalData>& data : all_signal_data_)
if (data->get_segment_count() > value)
value = data->get_segment_count();
{
vector<util::Timestamp> result;
- for (pair<uint32_t, util::Timestamp> entry : trigger_list_)
+ for (const pair<uint32_t, util::Timestamp>& entry : trigger_list_)
if (entry.first == segment_id)
result.push_back(entry.second);
return result;
}
-const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
+const vector< shared_ptr<data::SignalBase> > Session::signalbases() const
{
return signalbases_;
}
{
bool all_complete = true;
- for (shared_ptr<data::SignalBase> base : signalbases_)
+ for (const shared_ptr<data::SignalBase>& base : signalbases_)
if (!base->segment_is_complete(segment_id))
all_complete = false;
// Create the decode signal
signal = make_shared<data::DecodeSignal>(*this);
- signalbases_.insert(signal);
+ signalbases_.push_back(signal);
// Add the decode signal to all views
- for (shared_ptr<views::ViewBase> view : views_)
+ for (shared_ptr<views::ViewBase>& view : views_)
view->add_decode_signal(signal);
} catch (runtime_error& e) {
remove_decode_signal(signal);
void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
{
- signalbases_.erase(signal);
+ signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+ [&](shared_ptr<data::SignalBase> s) { return s == signal; }),
+ signalbases_.end());
- for (shared_ptr<views::ViewBase> view : views_)
+ for (shared_ptr<views::ViewBase>& view : views_)
view->remove_decode_signal(signal);
signals_changed();
}
#endif
+MetadataObjManager* Session::metadata_obj_manager()
+{
+ return &metadata_obj_manager_;
+}
+
void Session::set_capture_state(capture_state state)
{
bool changed;
+ if (state == Running)
+ acq_time_.restart();
+ if (state == Stopped)
+ qDebug("Acquisition took %.2f s", acq_time_.elapsed() / 1000.);
+
{
lock_guard<mutex> lock(sampling_mutex_);
changed = capture_state_ != state;
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase>& view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase>& view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
}
// Make the signals list
- for (shared_ptr<views::ViewBase> viewbase : views_) {
+ for (shared_ptr<views::ViewBase>& viewbase : views_) {
views::trace::View *trace_view =
qobject_cast<views::trace::View*>(viewbase.get());
if (trace_view) {
- unordered_set< shared_ptr<views::trace::Signal> >
- prev_sigs(trace_view->signals());
+ vector< shared_ptr<Signal> > prev_sigs(trace_view->signals());
trace_view->clear_signals();
for (auto channel : sr_dev->channels()) {
shared_ptr<data::SignalBase> signalbase;
- shared_ptr<views::trace::Signal> signal;
+ shared_ptr<Signal> signal;
// Find the channel in the old signals
const auto iter = find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
- [&](const shared_ptr<views::trace::Signal> &s) {
+ [&](const shared_ptr<Signal> &s) {
return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
} else {
// Find the signalbase for this channel if possible
signalbase.reset();
- for (const shared_ptr<data::SignalBase> b : signalbases_)
+ for (const shared_ptr<data::SignalBase>& b : signalbases_)
if (b->channel() == channel)
signalbase = b;
+ shared_ptr<Signal> signal;
+
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
signalbase = make_shared<data::SignalBase>(channel,
data::SignalBase::LogicChannel);
- signalbases_.insert(signalbase);
+ signalbases_.push_back(signalbase);
all_signal_data_.insert(logic_data_);
signalbase->set_data(logic_data_);
signalbase.get(), SLOT(on_capture_state_changed(int)));
}
- signal = shared_ptr<views::trace::Signal>(
- new views::trace::LogicSignal(*this,
- device_, signalbase));
- trace_view->add_signal(signal);
+ signal = shared_ptr<Signal>(new LogicSignal(*this, device_, signalbase));
break;
case SR_CHANNEL_ANALOG:
if (!signalbase) {
signalbase = make_shared<data::SignalBase>(channel,
data::SignalBase::AnalogChannel);
- signalbases_.insert(signalbase);
+ signalbases_.push_back(signalbase);
shared_ptr<data::Analog> data(new data::Analog());
all_signal_data_.insert(data);
signalbase.get(), SLOT(on_capture_state_changed(int)));
}
- signal = shared_ptr<views::trace::Signal>(
- new views::trace::AnalogSignal(
- *this, signalbase));
- trace_view->add_signal(signal);
+ signal = shared_ptr<Signal>(new AnalogSignal(*this, signalbase));
break;
}
assert(false);
break;
}
+
+ // New views take their signal settings from the main view
+ if (!viewbase->is_main_view()) {
+ shared_ptr<pv::views::trace::View> main_tv =
+ dynamic_pointer_cast<pv::views::trace::View>(main_view_);
+ shared_ptr<Signal> main_signal =
+ main_tv->get_signal_by_signalbase(signalbase);
+ signal->restore_settings(main_signal->save_settings());
+ }
+
+ trace_view->add_signal(signal);
}
}
}
{
assert(error_handler);
+#ifdef ENABLE_FLOW
+ pipeline_ = Pipeline::create();
+
+ source_ = ElementFactory::create_element("filesrc", "source");
+ sink_ = RefPtr<AppSink>::cast_dynamic(ElementFactory::create_element("appsink", "sink"));
+
+ pipeline_->add(source_)->add(sink_);
+ source_->link(sink_);
+
+ source_->set_property("location", Glib::ustring("/tmp/dummy_binary"));
+
+ sink_->set_property("emit-signals", TRUE);
+ sink_->signal_new_sample().connect(sigc::mem_fun(*this, &Session::on_gst_new_sample));
+
+ // Get the bus from the pipeline and add a bus watch to the default main context
+ RefPtr<Bus> bus = pipeline_->get_bus();
+ bus->add_watch(sigc::mem_fun(this, &Session::on_gst_bus_message));
+
+ // Start pipeline and Wait until it finished processing
+ pipeline_done_interrupt_ = false;
+ pipeline_->set_state(Gst::STATE_PLAYING);
+
+ unique_lock<mutex> pipeline_done_lock_(pipeline_done_mutex_);
+ pipeline_done_cond_.wait(pipeline_done_lock_);
+
+ // Let the pipeline free all resources
+ pipeline_->set_state(Gst::STATE_NULL);
+
+#else
if (!device_)
return;
error_handler(e.what());
set_capture_state(Stopped);
return;
+ } catch (QString& e) {
+ error_handler(e);
+ set_capture_state(Stopped);
+ return;
}
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
if (cur_logic_segment_)
qDebug() << "WARNING: SR_DF_END was not received.";
+#endif
// Optimize memory usage
free_unused_memory();
void Session::free_unused_memory()
{
- for (shared_ptr<data::SignalData> data : all_signal_data_) {
+ for (const shared_ptr<data::SignalData>& data : all_signal_data_) {
const vector< shared_ptr<data::Segment> > segments = data->segments();
- for (shared_ptr<data::Segment> segment : segments) {
+ for (const shared_ptr<data::Segment>& segment : segments)
segment->free_unused_memory();
- }
}
}
{
int segment_id = 0;
- for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
+ for (const 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;
segment_completed(segment_id);
}
+#ifdef ENABLE_FLOW
+bool Session::on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message)
+{
+ (void)bus;
+
+ if ((message->get_source() == pipeline_) && \
+ ((message->get_message_type() == Gst::MESSAGE_EOS)))
+ pipeline_done_cond_.notify_one();
+
+ // TODO Also evaluate MESSAGE_STREAM_STATUS to receive error notifications
+
+ return true;
+}
+
+Gst::FlowReturn Session::on_gst_new_sample()
+{
+ RefPtr<Gst::Sample> sample = sink_->pull_sample();
+ RefPtr<Gst::Buffer> buf = sample->get_buffer();
+
+ for (uint32_t block_id = 0; block_id < buf->n_memory(); block_id++) {
+ RefPtr<Gst::Memory> buf_mem = buf->get_memory(block_id);
+ Gst::MapInfo mapinfo;
+ buf_mem->map(mapinfo, Gst::MAP_READ);
+
+ shared_ptr<sigrok::Packet> logic_packet =
+ sr_context->create_logic_packet(mapinfo.get_data(), buf->get_size(), 1);
+
+ try {
+ feed_in_logic(dynamic_pointer_cast<sigrok::Logic>(logic_packet->payload()));
+ } catch (bad_alloc&) {
+ out_of_memory_ = true;
+ device_->stop();
+ buf_mem->unmap(mapinfo);
+ return Gst::FLOW_ERROR;
+ }
+
+ buf_mem->unmap(mapinfo);
+ }
+
+ return Gst::FLOW_OK;
+}
+#endif
+
void Session::feed_in_header()
{
// Nothing to do here for now
void Session::feed_in_meta(shared_ptr<Meta> meta)
{
- for (auto entry : meta->config()) {
+ for (auto& entry : meta->config()) {
switch (entry.first->id()) {
case SR_CONF_SAMPLERATE:
cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
uint64_t sample_count = 0;
{
- for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ for (const shared_ptr<pv::data::SignalData>& d : all_signal_data_) {
assert(d);
uint64_t temp_count = 0;
if (cur_logic_segment_)
cur_logic_segment_->set_complete();
- for (auto entry : cur_analog_segments_) {
+ for (auto& entry : cur_analog_segments_) {
shared_ptr<data::AnalogSegment> segment = entry.second;
segment->set_complete();
}
return;
}
+ if (logic->unit_size() > 8)
+ throw QString(tr("Can't handle more than 64 logic channels."));
+
if (!cur_samplerate_)
try {
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
update_signals();
float *channel_data = data.get();
- for (auto channel : channels) {
+ for (auto& channel : channels) {
shared_ptr<data::AnalogSegment> segment;
// Try to get the segment of the channel
if (cur_logic_segment_)
cur_logic_segment_->set_complete();
- for (auto entry : cur_analog_segments_) {
+ for (auto& entry : cur_analog_segments_) {
shared_ptr<data::AnalogSegment> segment = entry.second;
segment->set_complete();
}
data_saved_ = true;
}
+#ifdef ENABLE_DECODE
+void Session::on_new_decoders_selected(vector<const srd_decoder*> decoders)
+{
+ assert(decoders.size() > 0);
+
+ shared_ptr<data::DecodeSignal> signal = add_decode_signal();
+
+ if (signal)
+ for (unsigned int i = 0; i < decoders.size(); i++) {
+ const srd_decoder* d = decoders[i];
+ signal->stack_decoder(d, !(i < decoders.size() - 1));
+ }
+}
+#endif
+
} // namespace pv
projects / pulseview.git / blobdiff