Update panorama pipeline for very large panoramas #1244
Conversation
servantftechnicolor
commented
Sep 29, 2022
servantftechnicolor
commented
- Panorama warping, compositing and imageprocessing fail when the final panorama is too large because of very large image usage.
- Try to find ways to reduce memory consumption
| @@ -270,27 +270,62 @@ int aliceVision_main(int argc, char** argv) | |||
| // Preprocessing per view | |||
| for(std::size_t i = std::size_t(rangeStart); i < std::size_t(rangeStart + rangeSize); ++i) | |||
| { | |||
| const std::shared_ptr<sfmData::View> & viewIt = viewsOrderedByName[i]; | |||
| const std::shared_ptr<sfmData::View> & viewIt = viewsOrderedByName[i]; | |||
There was a problem hiding this comment.
Usage of tabs for new code is inconsistent with the rest of codebase.
| @@ -423,7 +595,7 @@ int aliceVision_main(int argc, char** argv) | |||
| boxes.push_back(localBbox); | |||
| } | |||
| } | |||
|
|
|||
| std::unique_ptr<oiio::ImageOutput> panorama = oiio::ImageOutput::create(outputPanoramaPath); | ||
| oiio::ImageSpec spec_panorama(panoramaWidth, panoramaHeight, 4, typeColor); | ||
| spec_panorama.tile_width = tileSize; | ||
| spec_panorama.tile_height = tileSize; |
There was a problem hiding this comment.
Tabs vs spaces here leading to apparently bad indentation.
| offsetX += panoramaWidth; | ||
| } | ||
|
|
||
| int left = std::floor(double(offsetX) / double(tileSize)); |
There was a problem hiding this comment.
Since offsetX and tileSize are both int, a simple division can be done here offsetX / tileSize as it truncates to integer result automatically.
| int left = std::floor(double(offsetX) / double(tileSize)); | ||
| int top = std::floor(double(offsetY) / double(tileSize)); | ||
| int right = std::ceil(double(offsetX + width - 1) / double(tileSize)); | ||
| int bottom = std::ceil(double(offsetY + height - 1) / double(tileSize)); |
There was a problem hiding this comment.
I think it makes sense to keep doing division in integers. Such upwards rounded division can be implemented like this:
int divideRoundUp(int a, int b)
{
return (a + b - 1) / b;
}
Which could be used here as:
int right = divideRoundUp(offsetX + width - 1, tileSize);
There was a problem hiding this comment.
#1254 introduces such function and fixes several bugs in division code (unrelated to this PR).
|
This PR could be 2 or 3 PRs which would be easier to merge than one large PR. E.g. Vector2d -> Vector2f changes could be a single PR. This introduces larger precision error, so having the change as a single PR would make it easier to understand if some precision issue in the future is caused by this change or by something else.
Third PR - everything what's left. |
servantftechnicolor
force-pushed
the
dev/largePanoramaMemoryClean
branch
2 times, most recently
from
b763784
to
2600a31
Compare
Conflicts: src/aliceVision/panorama/gaussian.cpp
fcastan
force-pushed
the
dev/largePanoramaMemoryClean
branch
from
3d32108
to
4f56e33
Compare
fabiencastan
force-pushed
the
dev/largePanoramaMemoryClean
branch
from
29b5fef
to
d773494
Compare
