tiles per thread for some more tiled algorithms, #5203

This commit is contained in:
heckflosse
2019-03-09 18:47:02 +01:00
parent 4dc0012f64
commit b0a7b5fed3
16 changed files with 161 additions and 105 deletions

View File

@@ -448,8 +448,12 @@ void Options::setDefaults()
maxInspectorBuffers = 2; // a rather conservative value for low specced systems...
inspectorDelay = 0;
serializeTiffRead = true;
measure = false;
chunkSizeAMAZE = 1;
chunkSizeCA = 1;
chunkSizeRCD = 1;
chunkSizeRGB = 1;
chunkSizeXT = 1;
FileBrowserToolbarSingleRow = false;
hideTPVScrollbar = false;
whiteBalanceSpotSize = 8;
@@ -1080,6 +1084,14 @@ void Options::readFromFile(Glib::ustring fname)
serializeTiffRead = keyFile.get_boolean("Performance", "SerializeTiffRead");
}
if (keyFile.has_key("Performance", "Measure")) {
measure = keyFile.get_boolean("Performance", "Measure");
}
if (keyFile.has_key("Performance", "ChunkSizeAMAZE")) {
chunkSizeAMAZE = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeAMAZE")));
}
if (keyFile.has_key("Performance", "ChunkSizeCA")) {
chunkSizeCA = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeCA")));
}
@@ -1088,6 +1100,14 @@ void Options::readFromFile(Glib::ustring fname)
chunkSizeRCD = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeRCD")));
}
if (keyFile.has_key("Performance", "ChunkSizeRGB")) {
chunkSizeRGB = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeRGB")));
}
if (keyFile.has_key("Performance", "ChunkSizeXT")) {
chunkSizeXT = std::min(16, std::max(1, keyFile.get_integer("Performance", "ChunkSizeXT")));
}
if (keyFile.has_key("Performance", "ThumbnailInspectorMode")) {
rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(keyFile.get_integer("Performance", "ThumbnailInspectorMode"));
}
@@ -1958,7 +1978,12 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("Performance", "InspectorDelay", inspectorDelay);
keyFile.set_integer("Performance", "PreviewDemosaicFromSidecar", prevdemo);
keyFile.set_boolean("Performance", "SerializeTiffRead", serializeTiffRead);
keyFile.set_integer("Performance", "Measure", measure);
keyFile.set_integer("Performance", "ChunkSizeAMAZE", chunkSizeAMAZE);
keyFile.set_integer("Performance", "ChunkSizeRCD", chunkSizeRCD);
keyFile.set_integer("Performance", "ChunkSizeRGB", chunkSizeRGB);
keyFile.set_integer("Performance", "ChunkSizeXT", chunkSizeXT);
keyFile.set_integer("Performance", "ChunkSizeCA", chunkSizeCA);
keyFile.set_integer("Performance", "ThumbnailInspectorMode", int(rtSettings.thumbnail_inspector_mode));
keyFile.set_string("Output", "Format", saveFormat.format);