X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=1f158c230b7f55c53630c0eb2e78f5f09ded6ed4;hb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c;hp=b79326d83363ed70efa20580a62bdf4068dcddbe;hpb=da50281d69f15d125b56971a3009fd31cbbab58b;p=pulseview.git
diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index b79326d..1f158c2 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -45,6 +44,7 @@ using std::list;
using std::map;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::vector;
using namespace pv::data::decode;
@@ -54,8 +54,8 @@ namespace data {
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength = 4096;
-const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
+const int64_t DecoderStack::DecodeChunkLength = 10 * 1024 * 1024;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
mutex DecoderStack::global_srd_mutex_;
@@ -75,8 +75,7 @@ DecoderStack::DecoderStack(pv::Session &session,
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
- stack_.push_back(shared_ptr(
- new decode::Decoder(dec)));
+ stack_.push_back(make_shared(dec));
}
DecoderStack::~DecoderStack()
@@ -146,14 +145,14 @@ std::vector DecoderStack::get_visible_rows() const
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- rows.push_back(Row(decc));
+ rows.emplace_back(decc);
// 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.push_back(Row(decc, ann_row));
+ rows.emplace_back(decc, ann_row);
}
}
@@ -191,9 +190,6 @@ void DecoderStack::clear()
void DecoderStack::begin_decode()
{
- shared_ptr logic_signal;
- shared_ptr data;
-
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
@@ -241,11 +237,14 @@ void DecoderStack::begin_decode()
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/segment
+ // logic signals have the same data/segment
+ pv::data::SignalBase *signalbase;
+ pv::data::Logic *data = nullptr;
+
for (const shared_ptr &dec : stack_)
if (dec && !dec->channels().empty() &&
- ((logic_signal = (*dec->channels().begin()).second)) &&
- ((data = logic_signal->logic_data())))
+ ((signalbase = (*dec->channels().begin()).second.get())) &&
+ ((data = signalbase->logic_data().get())))
break;
if (!data)
@@ -272,7 +271,7 @@ uint64_t DecoderStack::max_sample_count() const
{
uint64_t max_sample_count = 0;
- for (const auto & row : rows_)
+ for (const auto& row : rows_)
max_sample_count = max(max_sample_count,
row.second.get_max_sample());
@@ -302,20 +301,18 @@ optional DecoderStack::wait_for_data() const
}
void DecoderStack::decode_data(
- const int64_t sample_count, const unsigned int unit_size,
+ const int64_t abs_start_samplenum, const int64_t sample_count, const unsigned int unit_size,
srd_session *const session)
{
- uint8_t chunk[DecodeChunkLength];
-
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
- for (int64_t i = 0; !interrupt_ && i < sample_count;
+ for (int64_t i = abs_start_samplenum; !interrupt_ && i < sample_count;
i += chunk_sample_count) {
const int64_t chunk_end = min(
i + chunk_sample_count, sample_count);
- segment_->get_samples(chunk, i, chunk_end);
+ const uint8_t* chunk = segment_->get_samples(i, chunk_end);
if (srd_session_send(session, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
@@ -383,8 +380,10 @@ void DecoderStack::decode_proc()
srd_session_start(session);
+ int64_t abs_start_samplenum = 0;
do {
- decode_data(*sample_count, unit_size, session);
+ decode_data(abs_start_samplenum, *sample_count, unit_size, session);
+ abs_start_samplenum = *sample_count;
} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
// Destroy the session