DecodeSignal: Re-set decoder metadata after stack termination

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 1e0053910a9f3a68e3e948c70a817127f5c553a0..d17c883c4b380eaac155ae1d04c88d7cfa16330b 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -158,7 +158,8 @@ void DecodeSignal::reset_decode(bool shutting_down)
 
        if (!error_message_.isEmpty()) {
                error_message_ = QString();
 
        if (!error_message_.isEmpty()) {
                error_message_ = QString();

-               qDebug().noquote().nospace() << name() << ": Error cleared";
+               // TODO Emulate noquote()
+               qDebug().nospace() << name() << ": Error cleared";

        }
 
        decode_reset();
        }
 
        decode_reset();


@@ -588,7 +589,8 @@ void DecodeSignal::restore_settings(QSettings &settings)
 void DecodeSignal::set_error_message(QString msg)
 {
        error_message_ = msg;
 void DecodeSignal::set_error_message(QString msg)
 {
        error_message_ = msg;

-       qDebug().noquote().nospace() << name() << ": " << msg;
+       // TODO Emulate noquote()
+       qDebug().nospace() << name() << ": " << msg;

 }
 
 uint32_t DecodeSignal::get_input_segment_count() const
 }
 
 uint32_t DecodeSignal::get_input_segment_count() const


@@ -785,7 +787,9 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
        uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()];
        unsigned int signal_count = signal_data.size();
 
        uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()];
        unsigned int signal_count = signal_data.size();
 

-       for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) {
+       for (int64_t sample_cnt = 0; !logic_mux_interrupt_ && (sample_cnt < (end - start));
+               sample_cnt++) {
+

                int bitpos = 0;
                uint8_t bytepos = 0;
 
                int bitpos = 0;
                uint8_t bytepos = 0;
 


@@ -855,7 +859,7 @@ void DecodeSignal::logic_mux_proc()
 
                                // ...and process the newly muxed logic data
                                decode_input_cond_.notify_one();
 
                                // ...and process the newly muxed logic data
                                decode_input_cond_.notify_one();

-                       } while (processed_samples < samples_to_process);
+                       } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process));

                }
 
                if (samples_to_process == 0) {
                }
 
                if (samples_to_process == 0) {


@@ -898,6 +902,13 @@ void DecodeSignal::decode_data(
                const int64_t chunk_end = min(i + chunk_sample_count,
                        abs_start_samplenum + sample_count);
 
                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<mutex> 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);
                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);


@@ -911,11 +922,6 @@ void DecodeSignal::decode_data(
 
                delete[] chunk;
 
 
                delete[] chunk;
 

-               {
-                       lock_guard<mutex> 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();
                // Notify the frontend that we processed some data and
                // possibly have new annotations as well
                new_annotations();


@@ -979,9 +985,8 @@ void DecodeSignal::decode_proc()
                                segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
                                segments_.at(current_segment_id_).start_time = input_segment->start_time();
 
                                segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
                                segments_.at(current_segment_id_).start_time = input_segment->start_time();
 

-                               // Reset decoder state
-                               stop_srd_session();
-                               start_srd_session();
+                               // Reset decoder state but keep the decoder stack intact
+                               terminate_srd_session();

                        } else {
                                // All segments have been processed
                                decode_finished();
                        } else {
                                // All segments have been processed
                                decode_finished();


@@ -1001,8 +1006,6 @@ void DecodeSignal::decode_proc()
 
 void DecodeSignal::start_srd_session()
 {
 
 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_) {
        // 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_) {


@@ -1013,13 +1016,16 @@ void DecodeSignal::start_srd_session()
                // and) construction of another decoder stack.
 
                // TODO Reduce redundancy, use a common code path for
                // 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();
                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_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<decode::Decoder> &dec : stack_)
+                       dec->apply_all_options();

                srd_session_start(srd_session_);
                srd_session_start(srd_session_);

+

                return;
        }
 
                return;
        }
 


@@ -1046,10 +1052,8 @@ void DecodeSignal::start_srd_session()
        }
 
        // Start the 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);
 
        srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
                DecodeSignal::annotation_callback, this);


@@ -1067,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.
        // 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_);
                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<decode::Decoder> &dec : stack_)
+                       dec->apply_all_options();
+       }

 }
 
 void DecodeSignal::stop_srd_session()
 }
 
 void DecodeSignal::stop_srd_session()


@@ -1142,6 +1153,9 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
        DecodeSignal *const ds = (DecodeSignal*)decode_signal;
        assert(ds);
 
        DecodeSignal *const ds = (DecodeSignal*)decode_signal;
        assert(ds);
 

+       if (ds->decode_interrupt_)
+               return;
+

        lock_guard<mutex> lock(ds->output_mutex_);
 
        // Find the row
        lock_guard<mutex> lock(ds->output_mutex_);
 
        // Find the row


@@ -1193,6 +1207,12 @@ void DecodeSignal::on_data_cleared()
 
 void DecodeSignal::on_data_received()
 {
 
 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
        if (!logic_mux_thread_.joinable())
                begin_decode();
        else