projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1023 by implementing filtering channel selectors
[pulseview.git]
/
pv
/
data
/
decodesignal.cpp
diff --git
a/pv/data/decodesignal.cpp
b/pv/data/decodesignal.cpp
index 95ea45a4e0a707f62fd2b8e6ba259dc4ebd5fc52..ecdacdefa6ec09d53c6a1e8b343b40e6f661e96b 100644
(file)
--- a/
pv/data/decodesignal.cpp
+++ b/
pv/data/decodesignal.cpp
@@
-65,7
+65,7
@@
DecodeSignal::DecodeSignal(pv::Session &session) :
DecodeSignal::~DecodeSignal()
{
DecodeSignal::~DecodeSignal()
{
- reset_decode();
+ reset_decode(
true
);
}
const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
}
const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
@@
-130,9
+130,9
@@
bool DecodeSignal::toggle_decoder_visibility(int index)
return state;
}
return state;
}
-void DecodeSignal::reset_decode()
+void DecodeSignal::reset_decode(
bool shutting_down
)
{
{
- if (stack_config_changed_)
+ if (stack_config_changed_
|| shutting_down
)
stop_srd_session();
else
terminate_srd_session();
stop_srd_session();
else
terminate_srd_session();
@@
-156,7
+156,10
@@
void DecodeSignal::reset_decode()
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
- error_message_ = QString();
+ if (!error_message_.isEmpty()) {
+ error_message_ = QString();
+ qDebug().noquote().nospace() << name() << ": Error cleared";
+ }
decode_reset();
}
decode_reset();
}
@@
-178,14
+181,14
@@
void DecodeSignal::begin_decode()
reset_decode();
if (stack_.size() == 0) {
reset_decode();
if (stack_.size() == 0) {
-
error_message_ = tr("No decoders"
);
+
set_error_message(tr("No decoders")
);
return;
}
assert(channels_.size() > 0);
if (get_assigned_signal_count() == 0) {
return;
}
assert(channels_.size() > 0);
if (get_assigned_signal_count() == 0) {
-
error_message_ = tr("There are no channels assigned to this decoder"
);
+
set_error_message(tr("There are no channels assigned to this decoder")
);
return;
}
return;
}
@@
-199,8
+202,8
@@
void DecodeSignal::begin_decode()
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (!dec->have_required_channels()) {
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (!dec->have_required_channels()) {
-
error_message_ =
tr("One or more required channels "
- "have not been specified");
+
set_error_message(
tr("One or more required channels "
+ "have not been specified")
)
;
return;
}
return;
}
@@
-238,7
+241,7
@@
void DecodeSignal::begin_decode()
connect_input_notifiers();
if (get_input_segment_count() == 0) {
connect_input_notifiers();
if (get_input_segment_count() == 0) {
-
error_message_ = tr("No input data"
);
+
set_error_message(tr("No input data")
);
return;
}
return;
}
@@
-582,6
+585,12
@@
void DecodeSignal::restore_settings(QSettings &settings)
begin_decode();
}
begin_decode();
}
+void DecodeSignal::set_error_message(QString msg)
+{
+ error_message_ = msg;
+ qDebug().noquote().nospace() << name() << ": " << msg;
+}
+
uint32_t DecodeSignal::get_input_segment_count() const
{
uint64_t count = std::numeric_limits<uint64_t>::max();
uint32_t DecodeSignal::get_input_segment_count() const
{
uint64_t count = std::numeric_limits<uint64_t>::max();
@@
-895,7
+904,7
@@
void DecodeSignal::decode_data(
if (srd_session_send(srd_session_, i, chunk_end, chunk,
data_size, unit_size) != SRD_OK) {
if (srd_session_send(srd_session_, i, chunk_end, chunk,
data_size, unit_size) != SRD_OK) {
-
error_message_ = tr("Decoder reported an error"
);
+
set_error_message(tr("Decoder reported an error")
);
delete[] chunk;
break;
}
delete[] chunk;
break;
}
@@
-970,9
+979,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();
@@
-994,6
+1002,8
@@
void DecodeSignal::start_srd_session()
{
uint64_t samplerate;
{
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_) {
// When a decoder stack was created before, re-use it
// for the next stream of input data, after terminating
if (srd_session_) {
// When a decoder stack was created before, re-use it
// for the next stream of input data, after terminating
@@
-1022,7
+1032,7
@@
void DecodeSignal::start_srd_session()
srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
if (!di) {
srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
if (!di) {
-
error_message_ = tr("Failed to create decoder instance"
);
+
set_error_message(tr("Failed to create decoder instance")
);
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
return;
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
return;
@@
-1066,6
+1076,10
@@
void DecodeSignal::stop_srd_session()
// Destroy the session
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
// Destroy the session
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
+
+ // Mark the decoder instances as non-existant since they were deleted
+ for (const shared_ptr<decode::Decoder> &dec : stack_)
+ dec->invalidate_decoder_inst();
}
}
}
}