projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Move definition of MaxChunkSize
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 6f1eb1925dc3e34fe59e35e3343cb5f0e93e7fd0..5402df4f8539f4ebd51728277562f33342d1ffd2 100644
(file)
--- 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
* 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>
*/
#include <libsigrokdecode/libsigrokdecode.h>
@@
-191,9
+190,6
@@
void DecoderStack::clear()
void DecoderStack::begin_decode()
{
void DecoderStack::begin_decode()
{
- shared_ptr<pv::data::SignalBase> signalbase;
- shared_ptr<pv::data::Logic> data;
-
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
@@
-242,10
+238,13
@@
void DecoderStack::begin_decode()
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// logic signals have the same data/segment
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// 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() &&
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
- ((signalbase = (*dec->channels().begin()).second)) &&
- ((data = signalbase->logic_data())))
+ ((signalbase = (*dec->channels().begin()).second
.get()
)) &&
+ ((data = signalbase->logic_data()
.get()
)))
break;
if (!data)
break;
if (!data)
@@
-305,8
+304,6
@@
void DecoderStack::decode_data(
const int64_t sample_count, const unsigned int unit_size,
srd_session *const session)
{
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();
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);
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) {