X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=d17c883c4b380eaac155ae1d04c88d7cfa16330b;hp=f7057d06e07cef8ecf6d232ee48308ffcab47de4;hb=72486b789078f024e4f3404f81118c03b03e2b70;hpb=3b5282a20ec134853318b70441b32bf4a91e20c2 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index f7057d06..d17c883c 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -902,6 +902,13 @@ void DecodeSignal::decode_data( const int64_t chunk_end = min(i + chunk_sample_count, abs_start_samplenum + sample_count); + // Report this chunk as already decoded so that annotations don't + // appear in an area that we claim to not having been been decoded yet + { + lock_guard lock(output_mutex_); + segments_.at(current_segment_id_).samples_decoded = chunk_end; + } + int64_t data_size = (chunk_end - i) * unit_size; uint8_t* chunk = new uint8_t[data_size]; input_segment->get_samples(i, chunk_end, chunk); @@ -915,11 +922,6 @@ void DecodeSignal::decode_data( delete[] chunk; - { - lock_guard lock(output_mutex_); - segments_.at(current_segment_id_).samples_decoded = chunk_end; - } - // Notify the frontend that we processed some data and // possibly have new annotations as well new_annotations(); @@ -1004,8 +1006,6 @@ void DecodeSignal::decode_proc() void DecodeSignal::start_srd_session() { - uint64_t samplerate; - // If there were stack changes, the session has been destroyed by now, so if // it hasn't been destroyed, we can just reset and re-use it if (srd_session_) { @@ -1016,13 +1016,16 @@ void DecodeSignal::start_srd_session() // and) construction of another decoder stack. // TODO Reduce redundancy, use a common code path for - // the meta/cb/start sequence? + // the meta/start sequence? terminate_srd_session(); + + // Metadata is cleared also, so re-set it srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, g_variant_new_uint64(segments_.at(current_segment_id_).samplerate)); - srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, - DecodeSignal::annotation_callback, this); + for (const shared_ptr &dec : stack_) + dec->apply_all_options(); srd_session_start(srd_session_); + return; } @@ -1049,10 +1052,8 @@ void DecodeSignal::start_srd_session() } // Start the session - samplerate = segments_.at(current_segment_id_).samplerate; - if (samplerate) - srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(samplerate)); + srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(segments_.at(current_segment_id_).samplerate)); srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, DecodeSignal::annotation_callback, this); @@ -1070,8 +1071,15 @@ void DecodeSignal::terminate_srd_session() // have completed their operation, and reduces response time for // those stacks which still are processing data while the // application no longer wants them to. - if (srd_session_) + if (srd_session_) { srd_session_terminate_reset(srd_session_); + + // Metadata is cleared also, so re-set it + srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(segments_.at(current_segment_id_).samplerate)); + for (const shared_ptr &dec : stack_) + dec->apply_all_options(); + } } void DecodeSignal::stop_srd_session() @@ -1199,6 +1207,12 @@ void DecodeSignal::on_data_cleared() void DecodeSignal::on_data_received() { + // If we detected a lack of input data when trying to start decoding, + // we have set an error message. Only try again if we now have data + // to work with + if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0)) + return; + if (!logic_mux_thread_.joinable()) begin_decode(); else