X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecoderstack.cpp;h=d3e1f4acd25de681fd147253ddc8d423ce5cd2bc;hb=0402d7a3e425c56321234e4bb546d9b698c6d237;hp=d01bab2de111b155c9880ecf72a4fd3806316e62;hpb=caa4a2db5e100713818a353c17d2dc00fa475a2a;p=pulseview.git
diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index d01bab2..d3e1f4a 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
@@ -35,18 +34,18 @@
using std::lock_guard;
using std::mutex;
-using boost::optional;
using std::unique_lock;
using std::deque;
using std::make_pair;
using std::max;
using std::min;
using std::list;
-using std::map;
-using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::vector;
+using boost::optional;
+
using namespace pv::data::decode;
namespace pv {
@@ -54,7 +53,7 @@ namespace data {
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_;
@@ -75,8 +74,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()
@@ -88,13 +86,12 @@ DecoderStack::~DecoderStack()
}
}
-const std::list< std::shared_ptr >&
-DecoderStack::stack() const
+const list< shared_ptr >& DecoderStack::stack() const
{
return stack_;
}
-void DecoderStack::push(std::shared_ptr decoder)
+void DecoderStack::push(shared_ptr decoder)
{
assert(decoder);
stack_.push_back(decoder);
@@ -130,7 +127,7 @@ int64_t DecoderStack::samples_decoded() const
return samples_decoded_;
}
-std::vector DecoderStack::get_visible_rows() const
+vector DecoderStack::get_visible_rows() const
{
lock_guard lock(output_mutex_);
@@ -146,14 +143,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);
}
}
@@ -161,7 +158,7 @@ std::vector DecoderStack::get_visible_rows() const
}
void DecoderStack::get_annotation_subset(
- std::vector &dest,
+ vector &dest,
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
@@ -240,7 +237,7 @@ void DecoderStack::begin_decode()
// This works because we are currently assuming all
// logic signals have the same data/segment
pv::data::SignalBase *signalbase;
- pv::data::Logic *data;
+ pv::data::Logic *data = nullptr;
for (const shared_ptr &dec : stack_)
if (dec && !dec->channels().empty() &&
@@ -302,26 +299,26 @@ 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) {
error_message_ = tr("Decoder reported an error");
+ delete[] chunk;
break;
}
+ delete[] chunk;
{
lock_guard lock(output_mutex_);
@@ -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
@@ -424,7 +423,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
if (row_iter == d->rows_.end()) {
qDebug() << "Unexpected annotation: decoder = " << decc <<
", format = " << a.format();
- assert(0);
+ assert(false);
return;
}