X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=6f1eb1925dc3e34fe59e35e3343cb5f0e93e7fd0;hb=0f8f8c180b32413177f3940ea6f216d1cbadf09b;hp=59354735d1e328ee6cdd8d23a717ec7763f6fce6;hpb=a1a3656b4e18cb9fc078a51bf4256066ee307620;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 59354735..6f1eb192 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -55,7 +55,7 @@ namespace data { 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_srd_mutex_; @@ -191,7 +191,7 @@ void DecoderStack::clear() void DecoderStack::begin_decode() { - shared_ptr logic_signal; + shared_ptr signalbase; shared_ptr data; if (decode_thread_.joinable()) { @@ -241,11 +241,11 @@ void DecoderStack::begin_decode() // We get the logic data of the first channel in the list. // This works because we are currently assuming all - // LogicSignals have the same data/segment + // logic signals have the same data/segment for (const shared_ptr &dec : stack_) if (dec && !dec->channels().empty() && - ((logic_signal = (*dec->channels().begin()).second)) && - ((data = logic_signal->logic_data()))) + ((signalbase = (*dec->channels().begin()).second)) && + ((data = signalbase->logic_data()))) break; if (!data) @@ -272,9 +272,9 @@ uint64_t DecoderStack::max_sample_count() const { 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; }