diff options
| author | John Richardson <john.richardson@arm.com> | 2018-02-22 14:09:31 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 8de92619e223225aabdca873c02f231d8e941fd1 (patch) | |
| tree | 6b0c7a04e58e120fc9969270cb7ba432a31e1258 /src/core/NEON/kernels/NELKTrackerKernel.cpp | |
| parent | 2abb216e1aaeefe65c8a7e6294b4735f0647c927 (diff) | |
| download | ComputeLibrary-8de92619e223225aabdca873c02f231d8e941fd1.tar.gz | |
COMPMID-585: Port OpticalFlow to new validation
Change-Id: Ia36bd11ca27420d3059eea15df81b237900149ec
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125175
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: John Richardson <john.richardson@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NELKTrackerKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NELKTrackerKernel.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/NEON/kernels/NELKTrackerKernel.cpp b/src/core/NEON/kernels/NELKTrackerKernel.cpp index 004ecd07ef..83593e7f0d 100644 --- a/src/core/NEON/kernels/NELKTrackerKernel.cpp +++ b/src/core/NEON/kernels/NELKTrackerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -356,13 +356,16 @@ void NELKTrackerKernel::configure(const ITensor *input_old, const ITensor *input _termination = termination; _use_initial_estimate = use_initial_estimate; _epsilon = epsilon; - _num_iterations = num_iterations; _window_dimension = window_dimension; _level = level; _num_levels = num_levels; _pyramid_scale = pyramid_scale; _num_levels = num_levels; + // Set maximum number of iterations used for convergence + const size_t max_iterations = 1000; + _num_iterations = (termination == Termination::TERM_CRITERIA_EPSILON) ? max_iterations : num_iterations; + Window window; window.set(Window::DimX, Window::Dimension(0, old_points->num_values())); window.set(Window::DimY, Window::Dimension(0, 1)); @@ -471,7 +474,7 @@ void NELKTrackerKernel::run(const Window &window, const ThreadInfo &info) float prev_delta_x = 0.0f; float prev_delta_y = 0.0f; - for(unsigned int j = 0; j < _num_iterations || _termination == Termination::TERM_CRITERIA_EPSILON; ++j) + for(unsigned int j = 0; j < _num_iterations; ++j) { if(is_invalid_keypoint(new_keypoint)) { |