X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=d02a23a28ad7856262b3f889e599a896404dcfbf;hp=b9e57caa9e797725ed5532e226353cef527b7649;hb=883041605ce8536ece950b1de191cfe71068dfba;hpb=aa78b2df0c9cc94becf8621380c8da741a120d17

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index b9e57caa..d02a23a2 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -63,10 +63,24 @@ LogicSegment::LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
 LogicSegment::~LogicSegment()
 {
 	lock_guard<recursive_mutex> lock(mutex_);
+
 	for (MipMapLevel &l : mip_map_)
 		free(l.data);
 }
 
+shared_ptr<const LogicSegment> LogicSegment::get_shared_ptr() const
+{
+	shared_ptr<const Segment> ptr = nullptr;
+
+	try {
+		ptr = shared_from_this();
+	} catch (std::exception& e) {
+		/* Do nothing, ptr remains a null pointer */
+	}
+
+	return ptr ? std::dynamic_pointer_cast<const LogicSegment>(ptr) : nullptr;
+}
+
 template <class T>
 void LogicSegment::downsampleTmain(const T*&in, T &acc, T &prev)
 {
@@ -328,6 +342,7 @@ void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
 
 void LogicSegment::append_payload(void *data, uint64_t data_size)
 {
+	assert(unit_size_ > 0);
 	assert((data_size % unit_size_) == 0);
 
 	lock_guard<recursive_mutex> lock(mutex_);
@@ -341,11 +356,38 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
 	append_payload_to_mipmap();
 
 	if (sample_count > 1)
-		owner_.notify_samples_added(this, prev_sample_count + 1,
-			prev_sample_count + 1 + sample_count);
+		owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+			prev_sample_count + 1, prev_sample_count + 1 + sample_count);
 	else
-		owner_.notify_samples_added(this, prev_sample_count + 1,
-			prev_sample_count + 1);
+		owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+			prev_sample_count + 1, prev_sample_count + 1);
+}
+
+void LogicSegment::append_subsignal_payload(unsigned int index, void *data, uint64_t data_size)
+{
+	static vector<uint8_t> merged_data;  // To preserve intermediate data across calls
+
+	if (index == 0)
+		for (uint64_t i = 0; i < data_size * unit_size_; i++)
+			merged_data.emplace_back(0);
+
+	// Set the bits for this sub-signal where needed
+	// Note: the bytes in *data must either be 0 or 1, nothing else
+	unsigned int index_byte_offs = index / 8;
+	uint8_t* output_data = merged_data.data() + index_byte_offs;
+	uint8_t* input_data = (uint8_t*)data;
+
+	for (uint64_t i = 0; i < data_size; i++) {
+		assert((i * unit_size_ + index_byte_offs) < merged_data.size());
+		*output_data |= (input_data[i] << index);
+		output_data += unit_size_;
+	}
+
+	if (index == owner_.num_channels() - 1) {
+		// We gathered sample data of all sub-signals, let's append it
+		append_payload(merged_data.data(), merged_data.size());
+		merged_data.clear();
+	}
 }
 
 void LogicSegment::get_samples(int64_t start_sample,
@@ -628,7 +670,7 @@ void LogicSegment::append_payload_to_mipmap()
 		else if (unit_size_ == 4)
 			downsampleT<uint32_t>(src_ptr, dest_ptr, count);
 		else if (unit_size_ == 8)
-			downsampleT<uint8_t>(src_ptr, dest_ptr, count);
+			downsampleT<uint64_t>(src_ptr, dest_ptr, count);
 		else
 			downsampleGeneric(src_ptr, dest_ptr, count);
 		len_sample -= count;