return stack_;
}
-void DecodeSignal::stack_decoder(const srd_decoder *decoder)
+void DecodeSignal::stack_decoder(const srd_decoder *decoder, bool restart_decode)
{
assert(decoder);
decoder_stacked((void*)dec.get());
- begin_decode();
+ if (restart_decode)
+ begin_decode();
}
void DecodeSignal::remove_decoder(int index)
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
- const Row row(row_index++, decc, ann_row);
+ const Row row(row_index++, dec.get(), ann_row);
for (const GSList *ll = ann_row->ann_classes;
ll; ll = ll->next)
- class_rows_[make_pair(decc,
- GPOINTER_TO_INT(ll->data))] = row;
+ class_rows_[make_pair(decc, GPOINTER_TO_INT(ll->data))] = row;
}
}
int64_t result = 0;
- try {
- const DecodeSegment *segment = &(segments_.at(segment_id));
- if (include_processing)
- result = segment->samples_decoded_incl;
- else
- result = segment->samples_decoded_excl;
- } catch (out_of_range&) {
- // Do nothing
- }
+ if (segment_id >= segments_.size())
+ return result;
+
+ if (include_processing)
+ result = segments_[segment_id].samples_decoded_incl;
+ else
+ result = segments_[segment_id].samples_decoded_excl;
return result;
}
int row_index = 0;
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- rows.emplace_back(row_index++, decc);
+ rows.emplace_back(row_index++, dec.get());
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const srd_decoder_annotation_row *const ann_row =
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
- rows.emplace_back(row_index++, decc, ann_row);
+ rows.emplace_back(row_index++, dec.get(), ann_row);
}
}
return rows;
}
+uint64_t DecodeSignal::get_annotation_count(const decode::Row &row,
+ uint32_t segment_id) const
+{
+ if (segment_id >= segments_.size())
+ return 0;
+
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+ const map<const decode::Row, decode::RowData> *rows =
+ &(segment->annotation_rows);
+
+ const auto iter = rows->find(row);
+ if (iter != rows->end())
+ return (*iter).second.get_annotation_count();
+
+ return 0;
+}
+
void DecodeSignal::get_annotation_subset(
vector<pv::data::decode::Annotation> &dest,
const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
{
lock_guard<mutex> lock(output_mutex_);
- try {
- const DecodeSegment *segment = &(segments_.at(segment_id));
- const map<const decode::Row, decode::RowData> *rows =
- &(segment->annotation_rows);
+ if (segment_id >= segments_.size())
+ return;
- const auto iter = rows->find(row);
- if (iter != rows->end())
- (*iter).second.get_annotation_subset(dest,
- start_sample, end_sample);
- } catch (out_of_range&) {
- // Do nothing
- }
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+ const map<const decode::Row, decode::RowData> *rows = &(segment->annotation_rows);
+
+ const auto iter = rows->find(row);
+ if (iter != rows->end())
+ (*iter).second.get_annotation_subset(dest, start_sample, end_sample);
}
void DecodeSignal::get_annotation_subset(
{
// Note: We put all vectors and lists on the heap, not the stack
- const vector<Row> rows = get_rows(true);
+ const vector<Row> rows = get_rows();
// Use forward_lists for faster merging
forward_list<Annotation> *all_ann_list = new forward_list<Annotation>();
}
uint32_t DecodeSignal::get_binary_data_chunk_count(uint32_t segment_id,
- const Decoder* dec, uint8_t bin_class_id) const
+ const Decoder* dec, uint32_t bin_class_id) const
{
+ if (segments_.size() == 0)
+ return 0;
+
try {
const DecodeSegment *segment = &(segments_.at(segment_id));
}
void DecodeSignal::get_binary_data_chunk(uint32_t segment_id,
- const Decoder* dec, uint8_t bin_class_id, uint32_t chunk_id,
+ const Decoder* dec, uint32_t bin_class_id, uint32_t chunk_id,
const vector<uint8_t> **dest, uint64_t *size)
{
try {
}
}
-void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id,
- const Decoder* dec, uint8_t bin_class_id, uint64_t start_sample,
+void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id,
+ const Decoder* dec, uint32_t bin_class_id, uint64_t start_sample,
uint64_t end_sample, vector<uint8_t> *dest) const
{
assert(dest != nullptr);
}
}
+void DecodeSignal::get_merged_binary_data_chunks_by_offset(uint32_t segment_id,
+ const data::decode::Decoder* dec, uint32_t bin_class_id, uint64_t start,
+ uint64_t end, vector<uint8_t> *dest) const
+{
+ assert(dest != nullptr);
+
+ try {
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+
+ const DecodeBinaryClass* bin_class = nullptr;
+ for (const DecodeBinaryClass& bc : segment->binary_classes)
+ if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id))
+ bin_class = &bc;
+
+ // Determine overall size before copying to resize dest vector only once
+ uint64_t size = 0;
+ uint64_t offset = 0;
+ for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) {
+ if (offset >= start)
+ size += chunk.data.size();
+ offset += chunk.data.size();
+ if (offset >= end)
+ break;
+ }
+ dest->resize(size);
+
+ offset = 0;
+ uint64_t dest_offset = 0;
+ for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) {
+ if (offset >= start) {
+ memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size());
+ dest_offset += chunk.data.size();
+ }
+ offset += chunk.data.size();
+ if (offset >= end)
+ break;
+ }
+ } catch (out_of_range&) {
+ // Do nothing
+ }
+}
+
+const DecodeBinaryClass* DecodeSignal::get_binary_data_class(uint32_t segment_id,
+ const data::decode::Decoder* dec, uint32_t bin_class_id) const
+{
+ try {
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+
+ for (const DecodeBinaryClass& bc : segment->binary_classes)
+ if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id))
+ return &bc;
+ } catch (out_of_range&) {
+ // Do nothing
+ }
+
+ return nullptr;
+}
void DecodeSignal::save_settings(QSettings &settings) const
{
int row_index = 0;
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- (segments_.back().annotation_rows)[Row(row_index++, decc)] =
+ (segments_.back().annotation_rows)[Row(row_index++, dec.get())] =
decode::RowData();
// Add the decoder rows
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
- const Row row(row_index++, decc, ann_row);
+ const Row row(row_index++, dec.get(), ann_row);
// Add a new empty row data object
- (segments_.back().annotation_rows)[row] =
- decode::RowData();
+ (segments_.back().annotation_rows)[row] = decode::RowData();
}
}
// Prepare our binary output classes
for (const shared_ptr<decode::Decoder>& dec : stack_) {
- uint8_t n = dec->get_binary_class_count();
+ uint32_t n = dec->get_binary_class_count();
- for (uint8_t i = 0; i < n; i++)
+ for (uint32_t i = 0; i < n; i++)
segments_.back().binary_classes.push_back(
- {dec.get(), dec->get_binary_class(i), vector<DecodeBinaryDataChunk>()});
+ {dec.get(), dec->get_binary_class(i), deque<DecodeBinaryDataChunk>()});
}
}
row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find((*r).second);
else {
// Failing that, use the decoder as a key
- row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(0, decc));
+ for (const shared_ptr<decode::Decoder>& dec : ds->decoder_stack())
+ if (dec->decoder() == decc)
+ row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(0, dec.get()));
}
if (row_iter == ds->segments_.at(ds->current_segment_id_).annotation_rows.end()) {
DecodeBinaryClass* bin_class = nullptr;
for (DecodeBinaryClass& bc : segment->binary_classes)
- if ((bc.decoder->decoder() == decc) && (bc.info->bin_class_id == pdb->bin_class))
+ if ((bc.decoder->decoder() == decc) && (bc.info->bin_class_id == (uint32_t)pdb->bin_class))
bin_class = &bc;
if (!bin_class) {
chunk->data.resize(pdb->size);
memcpy(chunk->data.data(), pdb->data, pdb->size);
- // Note: using pdb->bin_class is only unique for each decoder in the stack,
- // so if two stacked decoders both emit binary data with the same bin_class,
- // we may be triggering unnecessary updates. Should be ok for now as that
- // case isn't possible yet. When it is, we might add the decoder's name
- // as an additional parameter to the signal, although string comparisons
- // are not really fast.
- ds->new_binary_data(ds->current_segment_id_, pdb->bin_class);
+ // Find decoder class instance
+ Decoder* dec = nullptr;
+ for (const shared_ptr<decode::Decoder>& d : ds->decoder_stack())
+ if (d->decoder() == decc) {
+ dec = d.get();
+ break;
+ }
+
+ ds->new_binary_data(ds->current_segment_id_, (void*)dec, pdb->bin_class);
}
void DecodeSignal::on_capture_state_changed(int state)