Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-13 13:32:53 +08:00
Code Issues Projects Releases Wiki Activity

fix: After capture end, the mipmap calculate block is invalid

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-04-28 11:06:20 +08:00
parent c6b7011491
commit 0c8e19dbaf
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
DSView/pv/data/logicsnapshot.cpp
View File

@ -307,7 +307,7 @@ void LogicSnapshot::append_cross_payload(const sr_datafeed_logic &logic)
uint16_t last_chan = _ch_fraction; uint16_t last_chan = _ch_fraction;
index0 = align_sample_count / LeafBlockSamples / RootScale; index0 = align_sample_count / LeafBlockSamples / RootScale;
index1 = (align_sample_count / LeafBlockSamples) % RootScale; index1 = (align_sample_count / LeafBlockSamples) % RootScale;
offset = align_sample_count % LeafBlockSamples; offset = align_sample_count % LeafBlockSamples;
lbp = _ch_data[fill_chan][index0].lbp[index1]; lbp = _ch_data[fill_chan][index0].lbp[index1];
if (lbp == NULL){ if (lbp == NULL){
@ -441,28 +441,35 @@ void LogicSnapshot::capture_ended()
Snapshot::capture_ended(); Snapshot::capture_ended();
_sample_count = _ring_sample_count;
_mipmap_sample_count = _ring_sample_count;
_ring_sample_count += _loop_offset;
uint64_t index0 = _ring_sample_count / LeafBlockSamples / RootScale; uint64_t index0 = _ring_sample_count / LeafBlockSamples / RootScale;
uint64_t index1 = (_ring_sample_count / LeafBlockSamples) % RootScale; uint64_t index1 = (_ring_sample_count / LeafBlockSamples) % RootScale;
uint64_t offset = (_ring_sample_count % LeafBlockSamples) / 8; uint64_t offset = (_ring_sample_count % LeafBlockSamples) / 8;
_sample_count = _ring_sample_count; _ring_sample_count -= _loop_offset;
if (offset == 0) if (offset > 0)
return; {
for (int chan=0; chan<_channel_num; chan++)
for (int chan=0; chan<_channel_num; chan++) {
{ if (_ch_data[chan][index0].lbp[index1] == NULL){
const uint64_t *end_ptr = (uint64_t*)_ch_data[chan][index0].lbp[index1] + (LeafBlockSamples / Scale); dsv_err("ERROR:LogicSnapshot::capture_ended(),buffer is null.");
uint64_t *ptr = (uint64_t*)((uint8_t*)_ch_data[chan][index0].lbp[index1] + offset); assert(false);
}
const uint64_t *end_ptr = (uint64_t*)_ch_data[chan][index0].lbp[index1] + (LeafBlockSamples / Scale);
uint64_t *ptr = (uint64_t*)((uint8_t*)_ch_data[chan][index0].lbp[index1] + offset);
while (ptr < end_ptr){ while (ptr < end_ptr){
*ptr++ = 0; *ptr++ = 0;
} }
calc_mipmap(chan, index0, index1, offset * 8, true); calc_mipmap(chan, index0, index1, offset * 8, true);
}
} }
_mipmap_sample_count = _ring_sample_count;
} }
void LogicSnapshot::calc_mipmap(unsigned int order, uint8_t index0, uint8_t index1, uint64_t samples, bool isEnd) void LogicSnapshot::calc_mipmap(unsigned int order, uint8_t index0, uint8_t index1, uint64_t samples, bool isEnd)