X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c5a0e4a7a36d54957e2c96312a796782e1b7e90a;hb=e8bb7c69bce723ed2b116598012cf85deb191ba8;hp=648b4cf57917a0cf3ea0a608942b1313c88719a6;hpb=2b2d10621d5cfd4502fa7a0500170412a5b67941;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 648b4cf..c5a0e4a 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <libsigrokdecode/libsigrokdecode.h>
@@ -302,20 +301,18 @@ optional<int64_t> DecoderStack::wait_for_data() const
 }
 
 void DecoderStack::decode_data(
-	const int64_t sample_count, const unsigned int unit_size,
+	const int64_t abs_start_samplenum, const int64_t sample_count, const unsigned int unit_size,
 	srd_session *const session)
 {
-	uint8_t chunk[DecodeChunkLength];
-
 	const unsigned int chunk_sample_count =
 		DecodeChunkLength / segment_->unit_size();
 
-	for (int64_t i = 0; !interrupt_ && i < sample_count;
+	for (int64_t i = abs_start_samplenum; !interrupt_ && i < sample_count;
 			i += chunk_sample_count) {
 
 		const int64_t chunk_end = min(
 			i + chunk_sample_count, sample_count);
-		segment_->get_samples(chunk, i, chunk_end);
+		const uint8_t* chunk = segment_->get_samples(i, chunk_end);
 
 		if (srd_session_send(session, i, chunk_end, chunk,
 				(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
@@ -383,8 +380,10 @@ void DecoderStack::decode_proc()
 
 	srd_session_start(session);
 
+	int64_t abs_start_samplenum = 0;
 	do {
-		decode_data(*sample_count, unit_size, session);
+		decode_data(abs_start_samplenum, *sample_count, unit_size, session);
+		abs_start_samplenum = *sample_count;
 	} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
 
 	// Destroy the session