#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/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 {
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(decoder);
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+void DecoderStack::remove(int index)
+{
+ using pv::data::decode::Decoder;
+
+ assert(index >= 0);
+ assert(index < (int)_stack.size());
+
+ // Find the decoder in the stack
+ list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
+ for(int i = 0; i < index; i++, iter++)
+ assert(iter != _stack.end());
+
+ // Delete the element
+ _stack.erase(iter);
+}
+
+int64_t DecoderStack::samples_decoded() const
+{
+ lock_guard<mutex> decode_lock(_mutex);
+ return _samples_decoded;
+}
+
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
_decode_thread.interrupt();
_decode_thread.join();
+ _samples_decoded = 0;
+
_annotations.clear();
// We get the logic data of the first probe in the list.
BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
if (dec && !dec->probes().empty() &&
((logic_signal = (*dec->probes().begin()).second)) &&
- ((data = logic_signal->data())))
+ ((data = logic_signal->logic_data())))
break;
if (!data)
// 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;
data);
}
-void DecoderStack::clear_snapshots()
+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)
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
- const int64_t sample_count = snapshot->get_sample_count() - 1;
+ const int64_t sample_count = snapshot->get_sample_count();
+ const unsigned int chunk_sample_count =
+ DecodeChunkLength / snapshot->unit_size();
+
+ // Clear error message upon every new session run
+ _error_message = QString();
// Create the session
srd_session_new(&session);
assert(session);
-
// Create the decoders
BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
{
if (!di)
{
- _error_message = tr("Failed to initialise decoder");
+ _error_message = tr("Failed to create decoder instance");
srd_session_destroy(session);
return;
}
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(
- 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,
chunk, chunk_end - i) != SRD_OK) {
- _error_message = tr("Failed to initialise decoder");
+ _error_message = tr("Decoder reported an error");
break;
}
+
+ {
+ lock_guard<mutex> lock(_mutex);
+ _samples_decoded = chunk_end;
+ }
}
// Destroy the session
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using namespace pv::view::decode;
+ using pv::data::decode::Annotation;
+
+ GSList *l, *ll;
+ int row, ann_class, idx = 0;
+ struct srd_decoder_annotation_row *ann_row;
+ struct srd_decoder *decc;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
+
+ Annotation a = Annotation(pdata);
+
+ decc = pdata->pdo->di->decoder;
+ BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, d->stack()) {
+ if (dec->decoder() == decc)
+ break;
+ idx++;
+ }
+ a.set_pd_index(idx);
+
+ for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
+ {
+ ann_row = (struct srd_decoder_annotation_row *)l->data;
+
+ for (ll = ann_row->ann_classes, ann_class = 0; ll;
+ ll = ll->next, ann_class++)
+ {
+ if (GPOINTER_TO_INT(ll->data) == a.format())
+ a.set_row(row);
+ }
+ }
+
d->_annotations.push_back(a);
d->new_decode_data();