X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;fp=pv%2Fdata%2Fdecodesignal.cpp;h=12379518acf9bb90dda59e376ee9b0145d5b7b69;hp=00812917013ae361f739ea649dbf9611792bef0e;hb=13b726cda35835a120ade2d9cc1ab58770d4ef3f;hpb=03408f5f5b62ce74016d91d60bdadce8dbddd46b

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 00812917..12379518 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -567,7 +567,7 @@ void DecodeSignal::get_binary_data_chunk(uint32_t segment_id,
 	}
 }
 
-void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id,
+void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id,
 	const Decoder* dec, uint32_t bin_class_id, uint64_t start_sample,
 	uint64_t end_sample, vector<uint8_t> *dest) const
 {
@@ -608,6 +608,48 @@ void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id,
 	}
 }
 
+void DecodeSignal::get_merged_binary_data_chunks_by_offset(uint32_t segment_id,
+	const data::decode::Decoder* dec, uint32_t bin_class_id, uint64_t start,
+	uint64_t end, vector<uint8_t> *dest) const
+{
+	assert(dest != nullptr);
+
+	try {
+		const DecodeSegment *segment = &(segments_.at(segment_id));
+
+		const DecodeBinaryClass* bin_class = nullptr;
+		for (const DecodeBinaryClass& bc : segment->binary_classes)
+			if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id))
+				bin_class = &bc;
+
+		// Determine overall size before copying to resize dest vector only once
+		uint64_t size = 0;
+		uint64_t offset = 0;
+		for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) {
+			if (offset >= start)
+				size += chunk.data.size();
+			offset += chunk.data.size();
+			if (offset >= end)
+				break;
+		}
+		dest->resize(size);
+
+		offset = 0;
+		uint64_t dest_offset = 0;
+		for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) {
+			if (offset >= start) {
+				memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size());
+				dest_offset += chunk.data.size();
+			}
+			offset += chunk.data.size();
+			if (offset >= end)
+				break;
+		}
+	} catch (out_of_range&) {
+		// Do nothing
+	}
+}
+
 const DecodeBinaryClass* DecodeSignal::get_binary_data_class(uint32_t segment_id,
 	const data::decode::Decoder* dec, uint32_t bin_class_id) const
 {