[mrl] Fix extra reference length in LCU bottom edge. Disable trace origins in valgrind test.

This commit is contained in:
siivonek 2021-11-28 22:05:18 +02:00
parent a01734375b
commit 675e8b2d83
2 changed files with 4 additions and 3 deletions

View file

@ -1025,8 +1025,9 @@ static void intra_recon_tb_leaf(
// Copy extra ref lines, including ref line 1 and top left corner.
for (int i = 0; i < MAX_REF_LINE_IDX; ++i) {
int height = (LCU_WIDTH >> depth) * 2 + MAX_REF_LINE_IDX;
height = MIN(height, pic_px.y - (y - MAX_REF_LINE_IDX));
kvz_pixels_blit(&frame->rec->y[(y - MAX_REF_LINE_IDX) * frame->rec->stride + x - (1 + i)],
height = MIN(height, (LCU_WIDTH - lcu_px.y + MAX_REF_LINE_IDX)); // Cut short if on bottom LCU edge. Cannot take references from below since they don't exist.
height = MIN(height, pic_px.y - luma_px.y + MAX_REF_LINE_IDX);
kvz_pixels_blit(&frame->rec->y[(luma_px.y - MAX_REF_LINE_IDX) * frame->rec->stride + luma_px.x - (1 + i)],
&extra_refs[i * 128],
1, height,
frame->rec->stride, 1);

View file

@ -39,7 +39,7 @@ valgrind_test() {
# If $KVZ_TEST_VALGRIND is defined and equal to "1", run the test with
# valgrind. Otherwise, run without valgrind.
if [ "${KVZ_TEST_VALGRIND:-0}" = '1' ]; then
valgrind='valgrind --leak-check=full --track-origins=yes --error-exitcode=1 --'
valgrind='valgrind --leak-check=full --error-exitcode=1 --'
else
valgrind=''
fi