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

faster histogram matching by using the processing pipeline in the thumbnail

Browse Source
This commit is contained in:
Alberto Griggio
2018-01-30 10:06:20 +01:00
parent 4ce9b0f010
commit 8af91ce74c
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rtengine/histmatching.cc
View File

@@ -208,26 +208,35 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
PreviewProps pp(cx, cy, fw, fh, skip); PreviewProps pp(cx, cy, fw, fh, skip);
ColorTemp currWB = getWB(); ColorTemp currWB = getWB();
std::unique_ptr<Imagefloat> image(new Imagefloat(int(fw / skip), int(fh / skip)));
{ {
RawImageSource rsrc; RawMetaDataLocation rml;
rsrc.load(getFileName()); eSensorType sensor_type;
rsrc.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false); double scale;
rsrc.demosaic(neutral.raw); int w = fw / skip, h = fh / skip;
rsrc.getImage(currWB, TR_NONE, image.get(), pp, neutral.toneCurve, neutral.raw); std::unique_ptr<Thumbnail> thumb(Thumbnail::loadFromRaw(getFileName(), rml, sensor_type, w, h, 1, false, false));
target.reset(thumb->processImage(neutral, sensor_type, fh / skip, TI_Nearest, getMetaData(), scale, false));
} }
// std::unique_ptr<Imagefloat> image(new Imagefloat(int(fw / skip), int(fh / skip)));
// {
// RawImageSource rsrc;
// rsrc.load(getFileName());
// rsrc.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
// rsrc.demosaic(neutral.raw);
// rsrc.getImage(currWB, TR_NONE, image.get(), pp, neutral.toneCurve, neutral.raw);
// }
// this could probably be made faster -- ideally we would need to just // this could probably be made faster -- ideally we would need to just
// perform the transformation from camera space to the output space // perform the transformation from camera space to the output space
// (taking gamma into account), but I couldn't find anything // (taking gamma into account), but I couldn't find anything
// ready-made, so for now this will do. Remember the famous quote: // ready-made, so for now this will do. Remember the famous quote:
// "premature optimization is the root of all evil" :-) // "premature optimization is the root of all evil" :-)
convertColorSpace(image.get(), neutral.icm, currWB); // convertColorSpace(image.get(), neutral.icm, currWB);
ImProcFunctions ipf(&neutral); // ImProcFunctions ipf(&neutral);
LabImage tmplab(image->getWidth(), image->getHeight()); // LabImage tmplab(image->getWidth(), image->getHeight());
ipf.rgb2lab(*image, tmplab, neutral.icm.working); // ipf.rgb2lab(*image, tmplab, neutral.icm.working);
image.reset(ipf.lab2rgbOut(&tmplab, 0, 0, tmplab.W, tmplab.H, neutral.icm)); // image.reset(ipf.lab2rgbOut(&tmplab, 0, 0, tmplab.W, tmplab.H, neutral.icm));
target.reset(image->to8()); // target.reset(image->to8());
if (settings->verbose) { if (settings->verbose) {
std::cout << "histogram matching: generated neutral rendering" << std::endl; std::cout << "histogram matching: generated neutral rendering" << std::endl;