const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
const int64_t DecoderStack::DecodeChunkLength = 4096;
-const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
-mutex DecoderStack::global_decode_mutex_;
+mutex DecoderStack::global_srd_mutex_;
DecoderStack::DecoderStack(pv::Session &session,
const srd_decoder *const dec) :
return samplerate_;
}
-double DecoderStack::start_time() const
+const pv::util::Timestamp& DecoderStack::start_time() const
{
return start_time_;
}
vector<Row> rows;
- for (const shared_ptr<decode::Decoder> &dec : stack_)
- {
+ for (const shared_ptr<decode::Decoder> &dec : stack_) {
assert(dec);
if (!dec->shown())
continue;
rows.push_back(Row(decc));
// Add the decoder rows
- for (const GSList *l = decc->annotation_rows; l; l = l->next)
- {
+ 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);
}
// Add classes
- for (const shared_ptr<decode::Decoder> &dec : stack_)
- {
+ for (const shared_ptr<decode::Decoder> &dec : stack_) {
assert(dec);
const srd_decoder *const decc = dec->decoder();
assert(dec->decoder());
rows_[Row(decc)] = decode::RowData();
// Add the decoder rows
- for (const GSList *l = decc->annotation_rows; l; l = l->next)
- {
+ 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);
{
uint64_t max_sample_count = 0;
- for (auto i = rows_.cbegin(); i != rows_.end(); i++)
+ for (const auto& row : rows_)
max_sample_count = max(max_sample_count,
- (*i).second.get_max_sample());
+ row.second.get_max_sample());
return max_sample_count;
}
optional<int64_t> DecoderStack::wait_for_data() const
{
unique_lock<mutex> input_lock(input_mutex_);
+
+ // Do wait if we decoded all samples but we're still capturing
+ // Do not wait if we're done capturing
while (!interrupt_ && !frame_complete_ &&
- samples_decoded_ >= sample_count_)
+ (samples_decoded_ >= sample_count_) &&
+ (session_.get_capture_state() != Session::Stopped)) {
+
input_cond_.wait(input_lock);
+ }
+
+ // Return value is valid if we're not aborting the decode,
return boost::make_optional(!interrupt_ &&
- (samples_decoded_ < sample_count_ || !frame_complete_),
+ // and there's more work to do...
+ (samples_decoded_ < sample_count_ || !frame_complete_) &&
+ // and if the end of the data hasn't been reached yet
+ (!((samples_decoded_ >= sample_count_) && (session_.get_capture_state() == Session::Stopped))),
sample_count_);
}
DecodeChunkLength / segment_->unit_size();
for (int64_t i = 0; !interrupt_ && i < sample_count;
- i += chunk_sample_count)
- {
- lock_guard<mutex> decode_lock(global_decode_mutex_);
+ i += chunk_sample_count) {
const int64_t chunk_end = min(
i + chunk_sample_count, sample_count);
segment_->get_samples(chunk, i, chunk_end);
if (srd_session_send(session, i, chunk_end, chunk,
- (chunk_end - i) * unit_size) != SRD_OK) {
+ (chunk_end - i) * unit_size, unit_size) != SRD_OK) {
error_message_ = tr("Decoder reported an error");
break;
}
assert(segment_);
+ // Prevent any other decode threads from accessing libsigrokdecode
+ lock_guard<mutex> srd_lock(global_srd_mutex_);
+
// Create the session
srd_session_new(&session);
assert(session);
// Create the decoders
const unsigned int unit_size = segment_->unit_size();
- for (const shared_ptr<decode::Decoder> &dec : stack_)
- {
- srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size);
+ for (const shared_ptr<decode::Decoder> &dec : stack_) {
+ srd_decoder_inst *const di = dec->create_decoder_inst(session);
- if (!di)
- {
+ if (!di) {
error_message_ = tr("Failed to create decoder instance");
srd_session_destroy(session);
return;
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);
- else
- {
+ else {
// Failing that, use the decoder as a key
row_iter = d->rows_.find(Row(decc));
}