Various binary output-related changes

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

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 6016ff6825a677eb7880642a834cd91dc5dc12c0..00812917013ae361f739ea649dbf9611792bef0e 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -442,15 +442,13 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id,
 
        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;
 }
@@ -493,18 +491,16 @@ void DecodeSignal::get_annotation_subset(
 {
        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(
@@ -535,8 +531,11 @@ void DecodeSignal::get_annotation_subset(
 }
 
 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));
 
@@ -551,7 +550,7 @@ uint32_t DecodeSignal::get_binary_data_chunk_count(uint32_t 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 {
@@ -569,7 +568,7 @@ void DecodeSignal::get_binary_data_chunk(uint32_t segment_id,
 }
 
 void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id,
-       const Decoder* dec, uint8_t bin_class_id, uint64_t start_sample,
+       const Decoder* dec, uint32_t bin_class_id, uint64_t start_sample,
        uint64_t end_sample, vector<uint8_t> *dest) const
 {
        assert(dest != nullptr);
@@ -609,6 +608,21 @@ void DecodeSignal::get_binary_data_chunks_merged(uint32_t segment_id,
        }
 }
 
+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
 {
@@ -1332,11 +1346,11 @@ void DecodeSignal::create_decode_segment()
 
        // 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>()});
        }
 }
 
@@ -1411,7 +1425,7 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal)
 
        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) {
@@ -1429,13 +1443,15 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal)
        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)