X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=354802407fa55487899e622bdc05ff2a176a40ce;hb=f32905530347e1020d5ce7959123cf797c9a4829;hp=7c1982bd707aeec31b46735b80f88f2c17d1215b;hpb=4c60462b00cc329e61daedd1c2e66724077bd412;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 7c1982bd..35480240 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -107,7 +107,7 @@ void DecoderStack::remove(int index) // Find the decoder in the stack auto iter = stack_.begin(); - for(int i = 0; i < index; i++, iter++) + for (int i = 0; i < index; i++, iter++) assert(iter != stack_.end()); // Delete the element @@ -286,7 +286,7 @@ uint64_t DecoderStack::max_sample_count() const optional DecoderStack::wait_for_data() const { unique_lock input_lock(input_mutex_); - while(!interrupt_ && !frame_complete_ && + while (!interrupt_ && !frame_complete_ && samples_decoded_ >= sample_count_) input_cond_.wait(input_lock); return boost::make_optional(!interrupt_ && @@ -312,7 +312,7 @@ void DecoderStack::decode_data( i + chunk_sample_count, sample_count); segment_->get_samples(chunk, i, chunk_end); - if (srd_session_send(session, i, i + sample_count, chunk, + if (srd_session_send(session, i, chunk_end, chunk, (chunk_end - i) * unit_size) != SRD_OK) { error_message_ = tr("Decoder reported an error"); break; @@ -379,7 +379,7 @@ void DecoderStack::decode_proc() do { decode_data(*sample_count, unit_size, session); - } while(error_message_.isEmpty() && (sample_count = wait_for_data())); + } while (error_message_.isEmpty() && (sample_count = wait_for_data())); // Destroy the session srd_session_destroy(session);