projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Paint the unresolved area to show the decode progress
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index bc26f9fccf1a93a2acaa38bea1a86621bca53687..d6fa17cafe8b6780239be558eeec88486923c1be 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-47,7
+47,8
@@
const int64_t DecoderStack::DecodeChunkLength = 4096;
mutex DecoderStack::_global_decode_mutex;
mutex DecoderStack::_global_decode_mutex;
-DecoderStack::DecoderStack(const srd_decoder *const dec)
+DecoderStack::DecoderStack(const srd_decoder *const dec) :
+ _samples_decoded(0)
{
_stack.push_back(shared_ptr<decode::Decoder>(
new decode::Decoder(dec)));
{
_stack.push_back(shared_ptr<decode::Decoder>(
new decode::Decoder(dec)));
@@
-87,6
+88,12
@@
void DecoderStack::remove(int index)
_stack.erase(iter);
}
_stack.erase(iter);
}
+int64_t DecoderStack::samples_decoded() const
+{
+ lock_guard<mutex> decode_lock(_mutex);
+ return _samples_decoded;
+}
+
const vector< shared_ptr<view::decode::Annotation> >
DecoderStack::annotations() const
{
const vector< shared_ptr<view::decode::Annotation> >
DecoderStack::annotations() const
{
@@
-108,6
+115,8
@@
void DecoderStack::begin_decode()
_decode_thread.interrupt();
_decode_thread.join();
_decode_thread.interrupt();
_decode_thread.join();
+ _samples_decoded = 0;
+
_annotations.clear();
// We get the logic data of the first probe in the list.
_annotations.clear();
// We get the logic data of the first probe in the list.
@@
-200,6
+209,11
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
_error_message = tr("Failed to initialise decoder");
break;
}
_error_message = tr("Failed to initialise decoder");
break;
}
+
+ {
+ lock_guard<mutex> lock(_mutex);
+ _samples_decoded = chunk_end;
+ }
}
// Destroy the session
}
// Destroy the session