From f471db4e8dc7f3dd1eb7a9cf4d8d11e7d340df65 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jan 2022 22:30:20 +0100 Subject: Cleanup: move stride_round_up into the only place it is used. --- src/lib/image.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/lib/image.cc') diff --git a/src/lib/image.cc b/src/lib/image.cc index 2e1d3fbf5..20aece3e8 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -973,9 +973,15 @@ Image::allocate () _stride = (int *) wrapped_av_malloc (4 * sizeof (int)); _stride[0] = _stride[1] = _stride[2] = _stride[3] = 0; + auto stride_round_up = [](int stride, int t) { + int const a = stride + (t - 1); + return a - (a % t); + }; + for (int i = 0; i < planes(); ++i) { _line_size[i] = ceil (_size.width * bytes_per_pixel(i)); - _stride[i] = stride_round_up (i, _line_size, _alignment == Alignment::PADDED ? ALIGNMENT : 1); + _stride[i] = stride_round_up (_line_size[i], _alignment == Alignment::PADDED ? ALIGNMENT : 1); + /* The assembler function ff_rgb24ToY_avx (in libswscale/x86/input.asm) uses a 16-byte fetch to read three bytes (R/G/B) of image data. -- cgit v1.2.3