From 5cc377022b810cb2ab291a0064e5749b976e185a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 18 Feb 2013 10:12:44 +0000 Subject: Correction to r54600 Calculate dependent area based on distortion model rather than using 15% of image resolution for this. Some assumptions here: - We're assuming real-life camera calibration is used here - Maximal undistortion delta would be achieved on frame boundary - Distortion fully goes inside frame This makes it possible to approximate margin for distortion by checking undistortion delta across frame boundary and use it for dependent area of interest. We do not use any formula-based equation here because we're likely support other distortion models and in that case it'll be stupid to try detecting formula here. --- .../operations/COM_MovieDistortionOperation.cpp | 33 +++++++++++++++++----- .../operations/COM_MovieDistortionOperation.h | 1 + 2 files changed, 27 insertions(+), 7 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index b0fc21d4d55..863a404ba67 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -75,9 +75,31 @@ void MovieDistortionOperation::initExecution() calibration_width, calibration_height, this->m_distortion); s_cache.push_back(newC); this->m_cache = newC; + + if (this->m_distortion) { + float delta[2]; + rcti full_frame; + full_frame.xmin = full_frame.ymin = 0; + full_frame.xmax = this->m_width; + full_frame.ymax = this->m_height; + BKE_tracking_max_undistortion_delta_across_bound(&this->m_movieClip->tracking, &full_frame, delta); + + /* 5 is just in case we didn't hit real max of distortion in + * BKE_tracking_max_undistortion_delta_across_bound + */ + m_margin[0] = delta[0] + 5; + m_margin[1] = delta[1] + 5; + } + else { + /* undistortion with sane distortion coefficients would be mapped inside + * of each tile, should be no need in margin in this case + */ + m_margin[0] = m_margin[1] = 0; + } } else { this->m_cache = NULL; + m_margin[0] = m_margin[1] = 0; } } @@ -115,13 +137,10 @@ void MovieDistortionOperation::executePixel(float output[4], float x, float y, P bool MovieDistortionOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) { - const int marginX = this->m_width * 0.15; - const int marginY = this->m_height * 0.15; - rcti newInput; - newInput.xmin = input->xmin - marginX; - newInput.ymin = input->ymin - marginY; - newInput.xmax = input->xmax + marginX; - newInput.ymax = input->ymax + marginY; + newInput.xmin = input->xmin - m_margin[0]; + newInput.ymin = input->ymin - m_margin[1]; + newInput.xmax = input->xmax + m_margin[0]; + newInput.ymax = input->ymax + m_margin[1]; return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output); } diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 4596fbd555b..c9629451992 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -148,6 +148,7 @@ private: DistortionCache *m_cache; SocketReader *m_inputOperation; MovieClip *m_movieClip; + int m_margin[2]; protected: bool m_distortion; -- cgit v1.2.3