decode: Fix mixup of bytes vs samples

(DecoderStack::decode_proc): The final argument to srd_session_send()
is a byte count, not a sample count.
(LogicSnapshot::get_samples): Multiply start_sample by the unit size
to get the byte offset into the buffer.

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 74ad7d362d0b2fe1e93dc31e928202b06689d23c..e667693e65dde4ec70bb77bd8fef3c980178807b 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -260,8 +260,9 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
        const shared_ptr<pv::data::LogicSnapshot> &snapshot =
                snapshots.front();
        const int64_t sample_count = snapshot->get_sample_count();
+       const unsigned int unit_size = snapshot->unit_size();
        const unsigned int chunk_sample_count =
-               DecodeChunkLength / snapshot->unit_size();
+               DecodeChunkLength / unit_size;
 
        // Create the session
        srd_session_new(&session);
@@ -305,8 +306,8 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
                        i + chunk_sample_count, sample_count);
                snapshot->get_samples(chunk, i, chunk_end);
 
-               if (srd_session_send(session, i, i + sample_count,
-                               chunk, chunk_end - i) != SRD_OK) {
+               if (srd_session_send(session, i, i + sample_count, chunk,
+                               (chunk_end - i) * unit_size) != SRD_OK) {
                        _error_message = tr("Decoder reported an error");
                        break;
                }

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index 444fa9ec4ceea93194dd02ce2f8aa8cfdb8a37a1..797a00bc54789f2cd4de2f7067448cf98aec0b96 100644 (file)
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -164,7 +164,7 @@ void LogicSnapshot::get_samples(uint8_t *const data,
        lock_guard<recursive_mutex> lock(_mutex);
 
        const size_t size = (end_sample - start_sample) * _unit_size;
-       memcpy(data, (const uint8_t*)_data + start_sample, size);
+       memcpy(data, (const uint8_t*)_data + start_sample * _unit_size, size);
 }
 
 void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m)