liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rcd: small speedup and cleaner code, #6054

Browse Source
This commit is contained in:
Ingo Weyrich
2021-01-14 19:12:49 +01:00
parent f94cf78696
commit 59b7eb0bbd
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtengine/rcd_demosaic.cc
View File

@@ -76,7 +76,7 @@ void RawImageSource::rcd_demosaic(size_t chunkSize, bool measure)
const unsigned int cfarray[2][2] = {{FC(0,0), FC(0,1)}, {FC(1,0), FC(1,1)}}; const unsigned int cfarray[2][2] = {{FC(0,0), FC(0,1)}, {FC(1,0), FC(1,1)}};
constexpr int rcdBorder = 6; constexpr int rcdBorder = 6;
constexpr int tileBorder = 9; constexpr int tileBorder = 9;
constexpr int tileSize = 140; constexpr int tileSize = 194;
constexpr int tileSizeN = tileSize - 2 * tileBorder; constexpr int tileSizeN = tileSize - 2 * tileBorder;
const int numTh = H / (tileSizeN) + ((H % (tileSizeN)) ? 1 : 0); const int numTh = H / (tileSizeN) + ((H % (tileSizeN)) ? 1 : 0);
const int numTw = W / (tileSizeN) + ((W % (tileSizeN)) ? 1 : 0); const int numTw = W / (tileSizeN) + ((W % (tileSizeN)) ? 1 : 0);
@@ -119,23 +119,15 @@ void RawImageSource::rcd_demosaic(size_t chunkSize, bool measure)
const int tilecols = std::min(colEnd - colStart, tileSize); const int tilecols = std::min(colEnd - colStart, tileSize);
for (int row = rowStart; row < rowEnd; row++) { for (int row = rowStart; row < rowEnd; row++) {
int indx = (row - rowStart) * tileSize;
const int c0 = fc(cfarray, row, colStart); const int c0 = fc(cfarray, row, colStart);
const int c1 = fc(cfarray, row, colStart + 1); const int c1 = fc(cfarray, row, colStart + 1);
int col = colStart; for (int col = colStart, indx = (row - rowStart) * tileSize; col < colEnd; ++col, ++indx) {
for (; col < colEnd - 1; col+=2, indx+=2) { cfa[indx] = rgb[c0][indx] = rgb[c1][indx] = LIM01(rawData[row][col] / scale);
cfa[indx] = rgb[c0][indx] = LIM01(rawData[row][col] / scale);
cfa[indx + 1] = rgb[c1][indx + 1] = LIM01(rawData[row][col + 1] / scale);
}
if (col < colEnd) {
cfa[indx] = rgb[c0][indx] = LIM01(rawData[row][col] / scale);
} }
} }
/** /**
* STEP 1: Find cardinal and diagonal interpolation directions * STEP 1: Find cardinal and diagonal interpolation directions
*/ */
float bufferV[3][tileSize - 8]; float bufferV[3][tileSize - 8];
// Step 1.1: Calculate the square of the vertical and horizontal color difference high pass filter // Step 1.1: Calculate the square of the vertical and horizontal color difference high pass filter
@@ -314,12 +306,12 @@ void RawImageSource::rcd_demosaic(size_t chunkSize, bool measure)
} }
// For the outermost tiles in all directions we can use a smaller border margin // For the outermost tiles in all directions we can use a smaller border margin
const int last_vertical = rowEnd - ((tr == numTh - 1) ? rcdBorder : tileBorder); const int firstVertical = rowStart + ((tr == 0) ? rcdBorder : tileBorder);
const int first_horizontal = colStart + ((tc == 0) ? rcdBorder : tileBorder); const int lastVertical = rowEnd - ((tr == numTh - 1) ? rcdBorder : tileBorder);
const int last_horizontal = colEnd - ((tc == numTw - 1) ? rcdBorder : tileBorder); const int firstHorizontal = colStart + ((tc == 0) ? rcdBorder : tileBorder);
for(int row = rowStart + ((tr == 0) ? rcdBorder : tileBorder); row < last_vertical; row++) { const int lastHorizontal = colEnd - ((tc == numTw - 1) ? rcdBorder : tileBorder);
// for (int row = rowStart + tileBorder; row < rowEnd - tileBorder; ++row) { for (int row = firstVertical; row < lastVertical; ++row) {
for (int col = first_horizontal; col < last_horizontal; ++col) { for (int col = firstHorizontal; col < lastHorizontal; ++col) {
int idx = (row - rowStart) * tileSize + col - colStart ; int idx = (row - rowStart) * tileSize + col - colStart ;
red[row][col] = std::max(0.f, rgb[0][idx] * scale); red[row][col] = std::max(0.f, rgb[0][idx] * scale);
green[row][col] = std::max(0.f, rgb[1][idx] * scale); green[row][col] = std::max(0.f, rgb[1][idx] * scale);