From a56f4fee38e17d05964941a5edc2850c217309d7 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Thu, 19 Jul 2012 11:05:18 +0000 Subject: Fix for * [#32040] size-input of a blur-node is uniform for the whole picture * [#32062] Blur node Size input is not working with * [#32140] Blur Node using a greyscale input as size multiplier fails to work Node now has a new option (new compositor cannot detect if the connected part is a single value, or an image connected). With this option the use of a reference image to multiply the size of the blur per pixel can be enabled/disabled. Regards, Jeroen - At Mind - --- .../operations/COM_GaussianBokehBlurOperation.cpp | 173 +++++++++++---------- 1 file changed, 87 insertions(+), 86 deletions(-) (limited to 'source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp') diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp index 93cc39849a2..fd70d0d329a 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp @@ -22,7 +22,7 @@ #include "COM_GaussianBokehBlurOperation.h" #include "BLI_math.h" - +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" } @@ -198,25 +198,20 @@ bool GaussianBokehBlurOperation::determineDependingAreaOfInterest(rcti *input, R } // reference image -GaussianBokehBlurReferenceOperation::GaussianBokehBlurReferenceOperation() : NodeOperation() +GaussianBlurReferenceOperation::GaussianBlurReferenceOperation() : BlurBaseOperation(COM_DT_COLOR) { - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_VALUE); - this->addOutputSocket(COM_DT_COLOR); - this->setComplex(true); - this->m_gausstab = NULL; - this->m_inputImage = NULL; - this->m_inputSize = NULL; + this->m_maintabs = NULL; } -void *GaussianBokehBlurReferenceOperation::initializeTileData(rcti *rect) +void *GaussianBlurReferenceOperation::initializeTileData(rcti *rect) { void *buffer = getInputOperation(0)->initializeTileData(NULL); return buffer; } -void GaussianBokehBlurReferenceOperation::initExecution() +void GaussianBlurReferenceOperation::initExecution() { + BlurBaseOperation::initExecution(); // setup gaustab this->m_data->image_in_width = this->getWidth(); this->m_data->image_in_height = this->getHeight(); @@ -237,100 +232,106 @@ void GaussianBokehBlurReferenceOperation::initExecution() } } + + /* horizontal */ + m_radx = (float)this->m_data->sizex; + int imgx = getWidth()/2; + if (m_radx > imgx) + m_radx = imgx; + else if (m_radx < 1) + m_radx = 1; + m_radxf = (float)m_radx; + + /* vertical */ + m_rady = (float)this->m_data->sizey; + int imgy = getHeight()/2; + if (m_rady > imgy) + m_rady = imgy; + else if (m_rady < 1) + m_rady = 1; + m_radyf = (float)m_rady; updateGauss(); - this->m_inputImage = this->getInputSocketReader(0); - this->m_inputSize = this->getInputSocketReader(1); } -void GaussianBokehBlurReferenceOperation::updateGauss() +void GaussianBlurReferenceOperation::updateGauss() { - int n; - float *dgauss; - float *ddgauss; - int j, i; - - n = (2 * radx + 1) * (2 * rady + 1); - - /* create a full filter image */ - ddgauss = new float[n]; - dgauss = ddgauss; - for (j = -rady; j <= rady; j++) { - for (i = -radx; i <= radx; i++, dgauss++) { - float fj = (float)j / radyf; - float fi = (float)i / radxf; - float dist = sqrt(fj * fj + fi * fi); - *dgauss = RE_filter_value(this->m_data->filtertype, dist); - } - } - this->m_gausstab = ddgauss; + int i; + int x = MAX2(m_radx, m_rady); + this->m_maintabs = (float**)MEM_mallocN(x * sizeof(float *), "gauss array"); + for (i = 0; i < x; i++) + m_maintabs[i] = make_gausstab(i + 1); } -void GaussianBokehBlurReferenceOperation::executePixel(float *color, int x, int y, void *data) +void GaussianBlurReferenceOperation::executePixel(float *color, int x, int y, void *data) { - float tempColor[4]; + MemoryBuffer *memorybuffer = (MemoryBuffer*)data; + float *buffer = memorybuffer->getBuffer(); + float *gausstabx, *gausstabcenty; + float *gausstaby, *gausstabcentx; + int i, j; + float *src; + register float sum, val; + float rval, gval, bval, aval; + int imgx = getWidth(); + int imgy = getHeight(); float tempSize[4]; - tempColor[0] = 0; - tempColor[1] = 0; - tempColor[2] = 0; - tempColor[3] = 0; - float multiplier_accum = 0; - MemoryBuffer *inputBuffer = (MemoryBuffer *)data; - float *buffer = inputBuffer->getBuffer(); - int bufferwidth = inputBuffer->getWidth(); - int bufferstartx = inputBuffer->getRect()->xmin; - int bufferstarty = inputBuffer->getRect()->ymin; this->m_inputSize->read(tempSize, x, y, data); - float size = tempSize[0]; - CLAMP(size, 0.0f, 1.0f); - float sizeX = ceil(this->m_data->sizex * size); - float sizeY = ceil(this->m_data->sizey * size); + float refSize = tempSize[0]; + int refradx = (int)(refSize * m_radxf); + int refrady = (int)(refSize * m_radyf); + if (refradx > m_radx) refradx = m_radx; + else if (refradx < 1) refradx = 1; + if (refrady > m_rady) refrady = m_rady; + else if (refrady < 1) refrady = 1; - if (sizeX <= 0.5f && sizeY <= 0.5f) { - this->m_inputImage->read(color, x, y, data); - return; - } - - int miny = y - sizeY; - int maxy = y + sizeY; - int minx = x - sizeX; - int maxx = x + sizeX; - miny = max(miny, inputBuffer->getRect()->ymin); - minx = max(minx, inputBuffer->getRect()->xmin); - maxy = min(maxy, inputBuffer->getRect()->ymax); - maxx = min(maxx, inputBuffer->getRect()->xmax); + if (refradx == 1 && refrady == 1) { + memorybuffer->readNoCheck(color, x, y); + } else { + int minxr = x - refradx < 0 ? -x : -refradx; + int maxxr = x + refradx > imgx ? imgx - x : refradx; + int minyr = y - refrady < 0 ? -y : -refrady; + int maxyr = y + refrady > imgy ? imgy - y : refrady; - int step = QualityStepHelper::getStep(); - int offsetadd = QualityStepHelper::getOffsetAdd(); - for (int ny = miny; ny < maxy; ny += step) { - int u = ny - y; - float uf = ((u/sizeY)*radyf)+radyf; - int indexu = uf * (radx*2+1); - int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth); - for (int nx = minx; nx < maxx; nx += step) { - int v = nx - x; - float vf = ((v/sizeX)*radxf)+radxf; - int index = indexu + vf; - const float multiplier = this->m_gausstab[index]; - madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplier); - multiplier_accum += multiplier; - index += step; - bufferindex += offsetadd; + float *srcd = buffer + COM_NUMBER_OF_CHANNELS * ( (y + minyr) * imgx + x + minxr); + + gausstabx = m_maintabs[refradx - 1]; + gausstabcentx = gausstabx + refradx; + gausstaby = m_maintabs[refrady - 1]; + gausstabcenty = gausstaby + refrady; + + sum = gval = rval = bval = aval = 0.0f; + for (i = minyr; i < maxyr; i++, srcd += COM_NUMBER_OF_CHANNELS * imgx) { + src = srcd; + for (j = minxr; j < maxxr; j++, src += COM_NUMBER_OF_CHANNELS) { + + val = gausstabcenty[i] * gausstabcentx[j]; + sum += val; + rval += val * src[0]; + gval += val * src[1]; + bval += val * src[2]; + aval += val * src[3]; + } } + sum = 1.0f / sum; + color[0] = rval * sum; + color[1] = gval * sum; + color[2] = bval * sum; + color[3] = aval * sum; } - mul_v4_v4fl(color, tempColor, 1.0f / multiplier_accum); } -void GaussianBokehBlurReferenceOperation::deinitExecution() +void GaussianBlurReferenceOperation::deinitExecution() { - delete [] this->m_gausstab; - this->m_gausstab = NULL; - this->m_inputImage = NULL; - this->m_inputSize = NULL; - + int x, i; + x = MAX2(m_radx, m_rady); + for (i = 0; i < x; i++) + delete []m_maintabs[i]; + MEM_freeN(m_maintabs); + BlurBaseOperation::deinitExecution(); } -bool GaussianBokehBlurReferenceOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) +bool GaussianBlurReferenceOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) { rcti newInput; NodeOperation *operation = this->getInputOperation(1); -- cgit v1.2.3