X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=91f98b581b8c0ed2a342321caf075cedff279b2d;hp=5a54d83aa047a0f245457eae0eb8832f67bc98ba;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9

diff --git a/pv/session.hpp b/pv/session.hpp
index 5a54d83a..91f98b58 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,24 +20,37 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#ifdef ENABLE_FLOW
+#include <atomic>
+#include <condition_variable>
+#endif
+
+#include <deque>
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <string>
 #include <thread>
-#include <unordered_set>
 #include <vector>
 
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QElapsedTimer>
 
+#ifdef ENABLE_FLOW
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
+
+#include "metadata_obj.hpp"
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+using std::deque;
 using std::function;
-using std::list;
 using std::map;
 using std::mutex;
 using std::recursive_mutex;
@@ -45,6 +58,13 @@ using std::shared_ptr;
 using std::string;
 using std::unordered_set;
 
+#ifdef ENABLE_FLOW
+using Glib::RefPtr;
+using Gst::AppSink;
+using Gst::Element;
+using Gst::Pipeline;
+#endif
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -75,6 +95,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -89,6 +110,8 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
+
 class Session : public QObject
 {
 	Q_OBJECT
@@ -100,6 +123,8 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
 	Session(DeviceManager &device_manager, QString name);
 
@@ -114,15 +139,15 @@ public:
 	shared_ptr<devices::Device> device() const;
 
 	QString name() const;
-
 	void set_name(QString name);
 
-	const list< shared_ptr<views::ViewBase> > views() const;
+	QString save_path() const;
+	void set_save_path(QString path);
 
-	shared_ptr<views::ViewBase> main_view() const;
+	const vector< shared_ptr<views::ViewBase> > views() const;
 
+	shared_ptr<views::ViewBase> main_view() const;
 	shared_ptr<pv::toolbars::MainBar> main_bar() const;
-
 	void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
 
 	/**
@@ -130,8 +155,9 @@ public:
 	 */
 	bool data_saved() const;
 
+	void save_setup(QSettings &settings) const;
 	void save_settings(QSettings &settings) const;
-
+	void restore_setup(QSettings &settings);
 	void restore_settings(QSettings &settings);
 
 	/**
@@ -143,38 +169,49 @@ public:
 	 * Sets device instance that will be used in the next capture session.
 	 */
 	void set_device(shared_ptr<devices::Device> device);
-
 	void set_default_device();
+	bool using_file_device() const;
 
-	void load_init_file(const string &file_name, const string &format);
+	void load_init_file(const string &file_name, const string &format,
+		const string &setup_file_name);
 
-	void load_file(QString file_name,
+	void load_file(QString file_name, QString setup_file_name = QString(),
 		shared_ptr<sigrok::InputFormat> format = nullptr,
 		const map<string, Glib::VariantBase> &options =
 			map<string, Glib::VariantBase>());
 
 	capture_state get_capture_state() const;
-
 	void start_capture(function<void (const QString)> error_handler);
-
 	void stop_capture();
 
 	double get_samplerate() const;
 
-	void register_view(shared_ptr<views::ViewBase> view);
+	uint32_t get_highest_segment_id() const;
+	uint64_t get_segment_sample_count(uint32_t segment_id) const;
 
-	void deregister_view(shared_ptr<views::ViewBase> view);
+	vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
 
+	void register_view(shared_ptr<views::ViewBase> view);
+	void deregister_view(shared_ptr<views::ViewBase> view);
 	bool has_view(shared_ptr<views::ViewBase> view);
 
-	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+	const vector< shared_ptr<data::SignalBase> > signalbases() const;
+	uint32_t get_signal_count(data::SignalBase::ChannelType type) const;
+	uint32_t get_next_signal_index(data::SignalBase::ChannelType type);
+
+	void add_generated_signal(shared_ptr<data::SignalBase> signal);
+	void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
 #ifdef ENABLE_DECODE
-	bool add_decoder(srd_decoder *const dec);
+	shared_ptr<data::DecodeSignal> add_decode_signal();
 
 	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	bool all_segments_complete(uint32_t segment_id) const;
+
+	MetadataObjManager* metadata_obj_manager();
+
 private:
 	void set_capture_state(capture_state state);
 
@@ -187,41 +224,76 @@ private:
 		vector<string> user_spec,
 		map<string, shared_ptr<Option>> fmt_opts);
 
-private:
 	void sample_thread_proc(function<void (const QString)> error_handler);
 
 	void free_unused_memory();
 
-	void feed_in_header();
+	void signal_new_segment();
+	void signal_segment_completed();
 
-	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
+#ifdef ENABLE_FLOW
+	bool on_gst_bus_message(const Glib::RefPtr<Gst::Bus>& bus, const Glib::RefPtr<Gst::Message>& message);
 
-	void feed_in_trigger();
+	Gst::FlowReturn on_gst_new_sample();
+#endif
 
+	void feed_in_header();
+	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
+	void feed_in_trigger();
 	void feed_in_frame_begin();
-
+	void feed_in_frame_end();
 	void feed_in_logic(shared_ptr<sigrok::Logic> logic);
-
 	void feed_in_analog(shared_ptr<sigrok::Analog> analog);
 
 	void data_feed_in(shared_ptr<sigrok::Device> device,
 		shared_ptr<sigrok::Packet> packet);
 
+Q_SIGNALS:
+	void capture_state_changed(int state);
+	void device_changed();
+
+	void signals_changed();
+
+	void name_changed();
+
+	void trigger_event(int segment_id, util::Timestamp location);
+
+	void new_segment(int new_segment_id);
+	void segment_completed(int segment_id);
+
+	void data_received();
+
+	void add_view(ViewType type, Session *session);
+
+public Q_SLOTS:
+	void on_data_saved();
+
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
+	bool shutting_down_;
+
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
-	QString default_name_, name_;
+	QString default_name_, name_, save_path_;
 
-	list< shared_ptr<views::ViewBase> > views_;
+	vector< shared_ptr<views::ViewBase> > views_;
 	shared_ptr<pv::views::ViewBase> main_view_;
 
 	shared_ptr<pv::toolbars::MainBar> main_bar_;
 
-	mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
+	mutable mutex sampling_mutex_; //!< Protects access to capture_state_
 	capture_state capture_state_;
 
-	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+	vector< shared_ptr<data::SignalBase> > signalbases_;
 	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+	deque<data::SignalGroup*> signal_groups_;
+	map<uint8_t, uint32_t> next_index_list_; // signal type -> index counter
+
+	/// trigger_list_ contains pairs of <segment_id, timestamp> values
+	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
 
 	mutable recursive_mutex data_mutex_;
 	shared_ptr<data::Logic> logic_data_;
@@ -229,33 +301,28 @@ private:
 	shared_ptr<data::LogicSegment> cur_logic_segment_;
 	map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
 		cur_analog_segments_;
+	int32_t highest_segment_id_;
+	vector<uint64_t> segment_sample_count_;
 
 	std::thread sampling_thread_;
 
 	bool out_of_memory_;
 	bool data_saved_;
+	bool frame_began_;
 
-Q_SIGNALS:
-	void capture_state_changed(int state);
-	void device_changed();
-
-	void signals_changed();
+	QElapsedTimer acq_time_;
 
-	void name_changed();
+	MetadataObjManager metadata_obj_manager_;
 
-	void trigger_event(util::Timestamp location);
+#ifdef ENABLE_FLOW
+	RefPtr<Pipeline> pipeline_;
+	RefPtr<Element> source_;
+	RefPtr<AppSink> sink_;
 
-	void frame_began();
-
-	void data_received();
-
-	void frame_ended();
-
-	void add_view(const QString &title, views::ViewType type,
-		Session *session);
-
-public Q_SLOTS:
-	void on_data_saved();
+	mutable mutex pipeline_done_mutex_;
+	mutable condition_variable pipeline_done_cond_;
+	atomic<bool> pipeline_done_interrupt_;
+#endif
 };
 
 } // namespace pv