projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tie the "sticky scrolling" setting in with the settings mgmt
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 2b07936840f49df3d76160f2b6250ed051278003..1f158c230b7f55c53630c0eb2e78f5f09ded6ed4 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-44,6
+44,7
@@
using std::list;
using std::map;
using std::pair;
using std::shared_ptr;
using std::map;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::vector;
using namespace pv::data::decode;
using std::vector;
using namespace pv::data::decode;
@@
-53,7
+54,7
@@
namespace data {
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength =
4096
;
+const int64_t DecoderStack::DecodeChunkLength =
10 * 1024 * 1024
;
const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
mutex DecoderStack::global_srd_mutex_;
const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
mutex DecoderStack::global_srd_mutex_;
@@
-74,8
+75,7
@@
DecoderStack::DecoderStack(pv::Session &session,
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
- stack_.push_back(shared_ptr<decode::Decoder>(
- new decode::Decoder(dec)));
+ stack_.push_back(make_shared<decode::Decoder>(dec));
}
DecoderStack::~DecoderStack()
}
DecoderStack::~DecoderStack()
@@
-145,14
+145,14
@@
std::vector<Row> DecoderStack::get_visible_rows() const
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
// 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);
// 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
);
}
}
}
}
@@
-301,20
+301,18
@@
optional<int64_t> DecoderStack::wait_for_data() const
}
void DecoderStack::decode_data(
}
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)
{
srd_session *const session)
{
- uint8_t chunk[DecodeChunkLength];
-
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
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);
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) {
if (srd_session_send(session, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
@@
-382,8
+380,10
@@
void DecoderStack::decode_proc()
srd_session_start(session);
srd_session_start(session);
+ int64_t abs_start_samplenum = 0;
do {
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
} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
// Destroy the session