projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename DecodeSignal::segment_ to logic_mux_segment_ for clarity
[pulseview.git]
/
pv
/
data
/
decodesignal.cpp
diff --git
a/pv/data/decodesignal.cpp
b/pv/data/decodesignal.cpp
index a57a9a1a9624556d5658dc3d6d3877f160194095..7e01dd8a3f1742c1dd5924709239efd3031d35f3 100644
(file)
--- a/
pv/data/decodesignal.cpp
+++ b/
pv/data/decodesignal.cpp
@@
-62,8
+62,6
@@
DecodeSignal::DecodeSignal(pv::Session &session) :
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
-
- set_name(tr("Empty decoder signal"));
}
DecodeSignal::~DecodeSignal()
}
DecodeSignal::~DecodeSignal()
@@
-238,8
+236,8
@@
void DecodeSignal::begin_decode()
const int64_t ch_count = get_assigned_signal_count();
const int64_t unit_size = (ch_count + 7) / 8;
logic_mux_data_ = make_shared<Logic>(ch_count);
const int64_t ch_count = get_assigned_signal_count();
const int64_t unit_size = (ch_count + 7) / 8;
logic_mux_data_ = make_shared<Logic>(ch_count);
- segment_ = make_shared<LogicSegment>(*logic_mux_data_, unit_size, samplerate_);
- logic_mux_data_->push_segment(segment_);
+
logic_mux_
segment_ = make_shared<LogicSegment>(*logic_mux_data_, unit_size, samplerate_);
+ logic_mux_data_->push_segment(
logic_mux_
segment_);
}
// Make sure the logic output data is complete and up-to-date
}
// Make sure the logic output data is complete and up-to-date
@@
-508,11
+506,13
@@
void DecodeSignal::restore_settings(QSettings &settings)
// Include the newly created decode channels in the channel lists
update_channel_list();
// Include the newly created decode channels in the channel lists
update_channel_list();
+ commit_decoder_channels();
break;
}
}
settings.endGroup();
break;
}
}
settings.endGroup();
+ channels_updated();
}
// Restore channel mapping
}
// Restore channel mapping
@@
-574,7
+574,7
@@
void DecodeSignal::update_channel_list()
if (!ch_added) {
// Create new entry without a mapped signal
if (!ch_added) {
// Create new entry without a mapped signal
- data::DecodeChannel ch = {id++, false, nullptr,
+ data::DecodeChannel ch = {id++,
0,
false, nullptr,
QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc),
SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch};
channels_.push_back(ch);
QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc),
SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch};
channels_.push_back(ch);
@@
-597,7
+597,7
@@
void DecodeSignal::update_channel_list()
if (!ch_added) {
// Create new entry without a mapped signal
if (!ch_added) {
// Create new entry without a mapped signal
- data::DecodeChannel ch = {id++, true, nullptr,
+ data::DecodeChannel ch = {id++,
0,
true, nullptr,
QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc),
SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch};
channels_.push_back(ch);
QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc),
SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch};
channels_.push_back(ch);
@@
-654,8
+654,11
@@
void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
vector<uint8_t> signal_in_bytepos;
vector<uint8_t> signal_in_bitpos;
vector<uint8_t> signal_in_bytepos;
vector<uint8_t> signal_in_bitpos;
+ int id = 0;
for (data::DecodeChannel &ch : channels_)
if (ch.assigned_signal) {
for (data::DecodeChannel &ch : channels_)
if (ch.assigned_signal) {
+ ch.bit_id = id++;
+
const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
segments.push_back(segment);
const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
segments.push_back(segment);
@@
-670,15
+673,15
@@
void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
}
// Perform the muxing of signal data into the output data
}
// Perform the muxing of signal data into the output data
- uint8_t* output = new uint8_t[(end - start) * segment_->unit_size()];
+ uint8_t* output = new uint8_t[(end - start) *
logic_mux_
segment_->unit_size()];
unsigned int signal_count = signal_data.size();
for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) {
int bitpos = 0;
uint8_t bytepos = 0;
unsigned int signal_count = signal_data.size();
for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) {
int bitpos = 0;
uint8_t bytepos = 0;
- const int out_sample_pos = sample_cnt * segment_->unit_size();
- for (unsigned int i = 0; i < segment_->unit_size(); i++)
+ const int out_sample_pos = sample_cnt *
logic_mux_
segment_->unit_size();
+ for (unsigned int i = 0; i <
logic_mux_
segment_->unit_size(); i++)
output[out_sample_pos + i] = 0;
for (unsigned int i = 0; i < signal_count; i++) {
output[out_sample_pos + i] = 0;
for (unsigned int i = 0; i < signal_count; i++) {
@@
-698,7
+701,7
@@
void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
}
}
}
}
-
segment_->append_payload(output, (end - start) *
segment_->unit_size());
+
logic_mux_segment_->append_payload(output, (end - start) * logic_mux_
segment_->unit_size());
delete[] output;
for (const uint8_t* data : signal_data)
delete[] output;
for (const uint8_t* data : signal_data)
@@
-709,7
+712,7
@@
void DecodeSignal::logic_mux_proc()
{
do {
const uint64_t input_sample_count = get_working_sample_count();
{
do {
const uint64_t input_sample_count = get_working_sample_count();
- const uint64_t output_sample_count = segment_->get_sample_count();
+ const uint64_t output_sample_count =
logic_mux_
segment_->get_sample_count();
const uint64_t samples_to_process =
(input_sample_count > output_sample_count) ?
const uint64_t samples_to_process =
(input_sample_count > output_sample_count) ?
@@
-717,7
+720,7
@@
void DecodeSignal::logic_mux_proc()
// Process the samples if necessary...
if (samples_to_process > 0) {
// Process the samples if necessary...
if (samples_to_process > 0) {
- const uint64_t unit_size = segment_->unit_size();
+ const uint64_t unit_size =
logic_mux_
segment_->unit_size();
const uint64_t chunk_sample_count = DecodeChunkLength / unit_size;
uint64_t processed_samples = 0;
const uint64_t chunk_sample_count = DecodeChunkLength / unit_size;
uint64_t processed_samples = 0;
@@
-795,7
+798,7
@@
void DecodeSignal::query_input_metadata()
void DecodeSignal::decode_data(
const int64_t abs_start_samplenum, const int64_t sample_count)
{
void DecodeSignal::decode_data(
const int64_t abs_start_samplenum, const int64_t sample_count)
{
- const int64_t unit_size = segment_->unit_size();
+ const int64_t unit_size =
logic_mux_
segment_->unit_size();
const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
for (int64_t i = abs_start_samplenum;
const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
for (int64_t i = abs_start_samplenum;
@@
-807,7
+810,7
@@
void DecodeSignal::decode_data(
int64_t data_size = (chunk_end - i) * unit_size;
uint8_t* chunk = new uint8_t[data_size];
int64_t data_size = (chunk_end - i) * unit_size;
uint8_t* chunk = new uint8_t[data_size];
- segment_->get_samples(i, chunk_end, chunk);
+
logic_mux_
segment_->get_samples(i, chunk_end, chunk);
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) {
@@
-844,7
+847,7
@@
void DecodeSignal::decode_proc()
// Keep processing new samples until we exhaust the input data
do {
lock_guard<mutex> input_lock(input_mutex_);
// Keep processing new samples until we exhaust the input data
do {
lock_guard<mutex> input_lock(input_mutex_);
- sample_count = segment_->get_sample_count() - abs_start_samplenum;
+ sample_count =
logic_mux_
segment_->get_sample_count() - abs_start_samplenum;
if (sample_count > 0) {
decode_data(abs_start_samplenum, sample_count);
if (sample_count > 0) {
decode_data(abs_start_samplenum, sample_count);
@@
-930,7
+933,7
@@
void DecodeSignal::connect_input_notifiers()
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
{
assert(pdata);
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
{
assert(pdata);
- assert(decode
r
);
+ assert(decode
_signal
);
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);