blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

VSE: bilinear upscaling no longer adds transparent border around the image #117717

Merged
Aras Pranckevicius merged 8 commits from aras_p/blender:vse_filter_aa into main 2024-02-02 16:29:01 +01:00
Conversation 3 Commits 8 Files Changed 16 +9 -9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ed09a1c86 - Show all commits

16
source/blender/blenlib/intern/math_interp.cc
View File

@ -317,21 +317,21 @@ BLI_INLINE void bilinear_fl_impl(const float *buffer,
/* Sample locations. */
if constexpr (border) {
row1 = (x1 < 0 || y1 < 0) ? empty : buffer + (size_t(width) * y1 + x1) * components;
row2 = (x1 < 0 || y2 > height - 1) ? empty : buffer + (size_t(width) * y2 + x1) * components;
row3 = (x2 > width - 1 || y1 < 0) ? empty : buffer + (size_t(width) * y1 + x2) * components;
row1 = (x1 < 0 || y1 < 0) ? empty : buffer + (int64_t(width) * y1 + x1) * components;
row2 = (x1 < 0 || y2 > height - 1) ? empty : buffer + (int64_t(width) * y2 + x1) * components;
row3 = (x2 > width - 1 || y1 < 0) ? empty : buffer + (int64_t(width) * y1 + x2) * components;
row4 = (x2 > width - 1 || y2 > height - 1) ? empty :
buffer + (size_t(width) * y2 + x2) * components;
buffer + (int64_t(width) * y2 + x2) * components;
}
else {
x1 = blender::math::clamp(x1, 0, width - 1);
x2 = blender::math::clamp(x2, 0, width - 1);
y1 = blender::math::clamp(y1, 0, height - 1);
y2 = blender::math::clamp(y2, 0, height - 1);
row1 = buffer + (size_t(width) * y1 + x1) * components;
row2 = buffer + (size_t(width) * y2 + x1) * components;
row3 = buffer + (size_t(width) * y1 + x2) * components;
row4 = buffer + (size_t(width) * y2 + x2) * components;
row1 = buffer + (int64_t(width) * y1 + x1) * components;
row2 = buffer + (int64_t(width) * y2 + x1) * components;
row3 = buffer + (int64_t(width) * y1 + x2) * components;
row4 = buffer + (int64_t(width) * y2 + x2) * components;
}
a = u - uf;

2
tests/python/sequencer_render_tests.py
View File

@ -51,7 +51,7 @@ def main():
report = render_report.Report("Sequencer", output_dir, oiiotool)
report.set_pixelated(True)
# default error tolerances are quite large, lower them
report.set_fail_threshold(1.0/255.0)
report.set_fail_threshold(1.0 / 255.0)
report.set_fail_percent(0.01)
report.set_reference_dir("reference")