projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added _session reference to Signal objects
[pulseview.git]
/
pv
/
data
/
logicsnapshot.cpp
diff --git
a/pv/data/logicsnapshot.cpp
b/pv/data/logicsnapshot.cpp
index af6ac0e8c367a097372aeea376cef6c101785e8b..f77690e137d6ced0a17b3f54ba0edf18f3ee1b9d 100644
(file)
--- a/
pv/data/logicsnapshot.cpp
+++ b/
pv/data/logicsnapshot.cpp
@@
-70,7
+70,7
@@
void LogicSnapshot::append_payload(
append_payload_to_mipmap();
}
append_payload_to_mipmap();
}
-void LogicSnapshot::reallocate_mip
_map
(MipMapLevel &m)
+void LogicSnapshot::reallocate_mip
map_level
(MipMapLevel &m)
{
const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
MipMapDataUnit) * MipMapDataUnit;
{
const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
MipMapDataUnit) * MipMapDataUnit;
@@
-101,14
+101,12
@@
void LogicSnapshot::append_payload_to_mipmap()
if (m0.length == prev_length)
return;
if (m0.length == prev_length)
return;
- reallocate_mip
_map
(m0);
+ reallocate_mip
map_level
(m0);
dest_ptr = (uint8_t*)m0.data + prev_length * _unit_size;
// Iterate through the samples to populate the first level mipmap
dest_ptr = (uint8_t*)m0.data + prev_length * _unit_size;
// Iterate through the samples to populate the first level mipmap
- accumulator = 0;
- diff_counter = MipMapScaleFactor;
- const uint8_t *end_src_ptr = (uint8_t*)_data +
+ const uint8_t *const end_src_ptr = (uint8_t*)_data +
m0.length * _unit_size * MipMapScaleFactor;
for (src_ptr = (uint8_t*)_data +
prev_length * _unit_size * MipMapScaleFactor;
m0.length * _unit_size * MipMapScaleFactor;
for (src_ptr = (uint8_t*)_data +
prev_length * _unit_size * MipMapScaleFactor;
@@
-143,12
+141,12
@@
void LogicSnapshot::append_payload_to_mipmap()
if (m.length == prev_length)
break;
if (m.length == prev_length)
break;
- reallocate_mip
_map
(m);
+ reallocate_mip
map_level
(m);
// Subsample the level lower level
src_ptr = (uint8_t*)ml.data +
_unit_size * prev_length * MipMapScaleFactor;
// Subsample the level lower level
src_ptr = (uint8_t*)ml.data +
_unit_size * prev_length * MipMapScaleFactor;
- const uint8_t *end_dest_ptr =
+ const uint8_t *
const
end_dest_ptr =
(uint8_t*)m.data + _unit_size * m.length;
for (dest_ptr = (uint8_t*)m.data +
_unit_size * prev_length;
(uint8_t*)m.data + _unit_size * m.length;
for (dest_ptr = (uint8_t*)m.data +
_unit_size * prev_length;
@@
-190,7
+188,7
@@
void LogicSnapshot::get_subsampled_edges(
assert(start <= end);
assert(min_length > 0);
assert(sig_index >= 0);
assert(start <= end);
assert(min_length > 0);
assert(sig_index >= 0);
- assert(sig_index <
SR_MAX_NUM_PROBES
);
+ assert(sig_index <
64
);
lock_guard<recursive_mutex> lock(_mutex);
lock_guard<recursive_mutex> lock(_mutex);