X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=5402df4f8539f4ebd51728277562f33342d1ffd2;hp=b79326d83363ed70efa20580a62bdf4068dcddbe;hb=038a14278afb24e10cd59991c2cafd97264fd3a5;hpb=da50281d69f15d125b56971a3009fd31cbbab58b

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index b79326d8..5402df4f 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <libsigrokdecode/libsigrokdecode.h>
@@ -55,7 +54,7 @@ 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 unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
 mutex DecoderStack::global_srd_mutex_;
 
@@ -191,9 +190,6 @@ void DecoderStack::clear()
 
 void DecoderStack::begin_decode()
 {
-	shared_ptr<pv::view::LogicSignal> logic_signal;
-	shared_ptr<pv::data::Logic> 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<decode::Decoder> &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());
 
@@ -305,8 +304,6 @@ void DecoderStack::decode_data(
 	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();
 
@@ -315,7 +312,7 @@ void DecoderStack::decode_data(
 
 		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) {