#include "decoderstack.hpp"
+#include <pv/data/decode/annotation.hpp>
+#include <pv/data/decode/decoder.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>
#include <pv/session.hpp>
-#include <pv/view/logicsignal.hpp>
+#include <pv/views/trace/logicsignal.hpp>
using std::lock_guard;
using std::mutex;
-using boost::optional;
using std::unique_lock;
using std::deque;
using std::make_pair;
using std::max;
using std::min;
using std::list;
-using std::map;
-using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::vector;
+using boost::optional;
+
using namespace pv::data::decode;
namespace pv {
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength = 4096;
+const int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024;
const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
mutex DecoderStack::global_srd_mutex_;
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
- stack_.push_back(shared_ptr<decode::Decoder>(
- new decode::Decoder(dec)));
+ stack_.push_back(make_shared<decode::Decoder>(dec));
}
DecoderStack::~DecoderStack()
}
}
-const std::list< std::shared_ptr<decode::Decoder> >&
-DecoderStack::stack() const
+const list< shared_ptr<decode::Decoder> >& DecoderStack::stack() const
{
return stack_;
}
-void DecoderStack::push(std::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(shared_ptr<decode::Decoder> decoder)
{
assert(decoder);
stack_.push_back(decoder);
return samples_decoded_;
}
-std::vector<Row> DecoderStack::get_visible_rows() const
+vector<Row> DecoderStack::get_visible_rows() const
{
lock_guard<mutex> lock(output_mutex_);
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- rows.push_back(Row(decc));
+ rows.emplace_back(decc);
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const srd_decoder_annotation_row *const ann_row =
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
- rows.push_back(Row(decc, ann_row));
+ rows.emplace_back(decc, ann_row);
}
}
return rows;
}
+uint64_t DecoderStack::inc_annotation_count()
+{
+ return (annotation_count_++);
+}
+
void DecoderStack::get_annotation_subset(
-
std::vector<pv::data::decode::Annotation> &dest,
+ vector<pv::data::decode::Annotation> &dest,
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
void DecoderStack::clear()
{
sample_count_ = 0;
+ annotation_count_ = 0;
frame_complete_ = false;
samples_decoded_ = 0;
error_message_ = QString();
}
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) {
error_message_ = tr("Decoder reported an error");
+ delete[] chunk;
break;
}
+ delete[] chunk;
{
lock_guard<mutex> lock(output_mutex_);
samples_decoded_ = chunk_end;
}
-
- if (i % DecodeNotifyPeriod == 0)
- new_decode_data();
}
-
- new_decode_data();
}
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()));
+ // Make sure all annotations are known to the frontend
+ new_annotations();
+
// Destroy the session
srd_session_destroy(session);
}
-void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
+void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder_stack)
{
assert(pdata);
assert(decoder);
- DecoderStack *const d = (DecoderStack*)decoder;
- assert(d);
+ DecoderStack *const ds = (DecoderStack*)decoder_stack;
+ assert(ds);
- lock_guard<mutex> lock(d->output_mutex_);
+ lock_guard<mutex> lock(ds->output_mutex_);
const Annotation a(pdata);
const srd_decoder *const decc = pdata->pdo->di->decoder;
assert(decc);
- auto row_iter = d->rows_.end();
+ auto row_iter = ds->rows_.end();
// Try looking up the sub-row of this class
- const auto r = d->class_rows_.find(make_pair(decc, a.format()));
- if (r != d->class_rows_.end())
- row_iter = d->rows_.find((*r).second);
+ const auto r = ds->class_rows_.find(make_pair(decc, a.format()));
+ if (r != ds->class_rows_.end())
+ row_iter = ds->rows_.find((*r).second);
else {
// Failing that, use the decoder as a key
- row_iter = d->rows_.find(Row(decc));
+ row_iter = ds->rows_.find(Row(decc));
}
- assert(row_iter != d->rows_.end());
- if (row_iter == d->rows_.end()) {
+ assert(row_iter != ds->rows_.end());
+ if (row_iter == ds->rows_.end()) {
qDebug() << "Unexpected annotation: decoder = " << decc <<
", format = " << a.format();
- assert(0);
+ assert(false);
return;
}
// Add the annotation
(*row_iter).second.push_annotation(a);
+
+ // Notify the frontend every DecodeNotifyPeriod annotations
+ if (ds->inc_annotation_count() % DecodeNotifyPeriod == 0)
+ ds->new_annotations();
}
void DecoderStack::on_new_frame()
projects / pulseview.git / blobdiff