From f471db4e8dc7f3dd1eb7a9cf4d8d11e7d340df65 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jan 2022 22:30:20 +0100 Subject: [PATCH] Cleanup: move stride_round_up into the only place it is used. --- src/lib/image.cc | 8 +++++++- src/lib/util.cc | 14 -------------- src/lib/util.h | 1 - 3 files changed, 7 insertions(+), 16 deletions(-) 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. diff --git a/src/lib/util.cc b/src/lib/util.cc index 1984ed476..2767068d4 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -551,20 +551,6 @@ simple_digest (vector paths) } -/** Round a number up to the nearest multiple of another number. - * @param c Index. - * @param stride Array of numbers to round, indexed by c. - * @param t Multiple to round to. - * @return Rounded number. - */ -int -stride_round_up (int c, int const * stride, int t) -{ - int const a = stride[c] + (t - 1); - return a - (a % t); -} - - /** Trip an assert if the caller is not in the UI thread */ void ensure_ui_thread () diff --git a/src/lib/util.h b/src/lib/util.h index 790feea05..a36903437 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -102,7 +102,6 @@ extern boost::filesystem::path mo_path (); #endif extern std::string tidy_for_filename (std::string); extern dcp::Size fit_ratio_within (float ratio, dcp::Size); -extern int stride_round_up (int, int const *, int); extern void* wrapped_av_malloc (size_t); extern void set_backtrace_file (boost::filesystem::path); extern std::map split_get_request (std::string url); -- 2.30.2