X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=648b4cf57917a0cf3ea0a608942b1313c88719a6;hp=441ff3c3df9f327a5ce25f80759eebd11073eac2;hb=2b2d10621d5cfd4502fa7a0500170412a5b67941;hpb=27c0521002ea986b72d9675b99803665516db14c diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 441ff3c3..648b4cf5 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,9 +191,6 @@ void DecoderStack::clear() void DecoderStack::begin_decode() { - shared_ptr logic_signal; - shared_ptr data; - if (decode_thread_.joinable()) { interrupt_ = true; input_cond_.notify_one(); @@ -241,11 +238,14 @@ 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 + pv::data::SignalBase *signalbase; + pv::data::Logic *data = nullptr; + 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.get())) && + ((data = signalbase->logic_data().get()))) break; if (!data)