projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set LIMIT_FRAMES to 1 if supported.
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 760d336e14c4dcb65628b2ebb9a8bff31849754e..b8eff67ffd02d0dc5ab018806b056b0c9849cf67 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-32,11
+32,16
@@
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
#include <pv/view/logicsignal.h>
#include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.h>
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::deque;
+using std::min;
+using std::list;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-94,8
+99,7
@@
int64_t DecoderStack::samples_decoded() const
return _samples_decoded;
}
return _samples_decoded;
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
{
lock_guard<mutex> lock(_mutex);
return _annotations;
@@
-133,7
+137,7
@@
void DecoderStack::begin_decode()
// Get the samplerate and start time
_start_time = data->get_start_time();
// Get the samplerate and start time
_start_time = data->get_start_time();
- _samplerate = data->
get_
samplerate();
+ _samplerate = data->samplerate();
if (_samplerate == 0.0)
_samplerate = 1.0;
if (_samplerate == 0.0)
_samplerate = 1.0;
@@
-143,6
+147,14
@@
void DecoderStack::begin_decode()
void DecoderStack::clear()
{
void DecoderStack::clear()
{
+ _annotations.clear();
+}
+
+uint64_t DecoderStack::get_max_sample_count() const
+{
+ if (_annotations.empty())
+ return 0;
+ return _annotations.back().end_sample();
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@
-161,12
+173,13
@@
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() - 1;
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
const int64_t sample_count = snapshot->get_sample_count() - 1;
+ const unsigned int chunk_sample_count =
+ DecodeChunkLength / snapshot->unit_size();
// Create the session
srd_session_new(&session);
assert(session);
// Create the session
srd_session_new(&session);
assert(session);
-
// Create the decoders
BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
{
// Create the decoders
BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
{
@@
-195,13
+208,14
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
srd_session_start(session);
for (int64_t i = 0;
srd_session_start(session);
for (int64_t i = 0;
- !this_thread::interruption_requested() && i < sample_count;
- i += DecodeChunkLength)
+ !boost::this_thread::interruption_requested() &&
+ i < sample_count;
+ i += chunk_sample_count)
{
lock_guard<mutex> decode_lock(_global_decode_mutex);
const int64_t chunk_end = min(
{
lock_guard<mutex> decode_lock(_global_decode_mutex);
const int64_t chunk_end = min(
- i +
DecodeChunkLength
, sample_count);
+ i +
chunk_sample_count
, sample_count);
snapshot->get_samples(chunk, i, chunk_end);
if (srd_session_send(session, i, i + sample_count,
snapshot->get_samples(chunk, i, chunk_end);
if (srd_session_send(session, i, i + sample_count,
@@
-222,16
+236,15
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using
namespace pv::view::decode
;
+ using
pv::data::decode::Annotation
;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
lock_guard<mutex> lock(d->_mutex);
- d->_annotations.push_back(
a
);
+ d->_annotations.push_back(
Annotation(pdata)
);
d->new_decode_data();
}
d->new_decode_data();
}