Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[software] Some adjustments to export animated camera #1047

Merged
merged 4 commits into from
May 27, 2021
Merged

[software] Some adjustments to export animated camera #1047

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a07461
[software] ExportAnimatedCamera: consider as video by default
fabiencastan May 26, 2021
b272d40
[software] exportAnimatedCamera: export both distort and undistort UV…
fabiencastan May 27, 2021
19f20ab
[software] exportAnimatedCamera: minor code simplification
fabiencastan May 27, 2021
81f1429
[software] exportAnimatedCamera: add an sfmDataFilter option
fabiencastan May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 57 additions & 29 deletions src/software/export/main_exportAnimatedCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,25 +234,51 @@ int aliceVision_main(int argc, char** argv)
}
ALICEVISION_LOG_DEBUG("ppCorrection:" + std::to_string(ppCorrection[0]) + ";" +std::to_string(ppCorrection[1]));

// flip and normalize for Nuke
#pragma omp parallel for
for(int y = 0; y < int(intrinsic.h()); ++y)
// UV Map: Undistort
{
for(int x = 0; x < int(intrinsic.w()); ++x)
// flip and normalize as UVMap
#pragma omp parallel for
for(int y = 0; y < int(intrinsic.h()); ++y)
{
const Vec2 undisto_pix(x, y);
// compute coordinates with distortion
const Vec2 disto_pix = intrinsic.get_d_pixel(undisto_pix) + ppCorrection;

image_dist(y, x).r() = (disto_pix[0]) / (intrinsic.w() - 1);
image_dist(y, x).g() = (intrinsic.h() - 1 - disto_pix[1]) / (intrinsic.h() - 1);
for(int x = 0; x < int(intrinsic.w()); ++x)
{
const Vec2 undisto_pix(x, y);
// compute coordinates with distortion
const Vec2 disto_pix = intrinsic.get_d_pixel(undisto_pix) + ppCorrection;

image_dist(y, x).r() = float((disto_pix[0]) / (intrinsic.w() - 1));
image_dist(y, x).g() = float((intrinsic.h() - 1 - disto_pix[1]) / (intrinsic.h() - 1));
}
}

const std::string dstImage =
(undistortedImagesFolderPath / (std::to_string(intrinsicPair.first) + "_UVMap_Undistort." +
image::EImageFileType_enumToString(outputMapFileType))).string();
image::writeImage(dstImage, image_dist, image::EImageColorSpace::AUTO);
}

const std::string dstImage =
(undistortedImagesFolderPath / ("Distortion_UVMap_" + std::to_string(intrinsicPair.first) + "." +
image::EImageFileType_enumToString(outputMapFileType))).string();
image::writeImage(dstImage, image_dist, image::EImageColorSpace::AUTO);
// UV Map: Distort
{
// flip and normalize as UVMap
#pragma omp parallel for
for(int y = 0; y < int(intrinsic.h()); ++y)
{
for(int x = 0; x < int(intrinsic.w()); ++x)
{
const Vec2 disto_pix(x, y);
// compute coordinates without distortion
const Vec2 undisto_pix = intrinsic.get_ud_pixel(disto_pix) - ppCorrection;

image_dist(y, x).r() = float((undisto_pix[0]) / (intrinsic.w() - 1));
image_dist(y, x).g() = float((intrinsic.h() - 1 - undisto_pix[1]) / (intrinsic.h() - 1));
}
}

const std::string dstImage =
(undistortedImagesFolderPath / (std::to_string(intrinsicPair.first) + "_UVMap_Distort." +
image::EImageFileType_enumToString(outputMapFileType))).string();
image::writeImage(dstImage, image_dist, image::EImageColorSpace::AUTO);
}
}
}

Expand Down Expand Up @@ -349,32 +375,34 @@ int aliceVision_main(int argc, char** argv)
std::smatch matches;
if(std::regex_search(imagePathStem, matches, regexFrame))
{
const std::string prefix = matches[1];
const std::string suffix = matches[3];
frameN = std::stoi(matches[2]);
const std::string prefix = matches[1];
const std::string suffix = matches[3];
frameN = std::stoi(matches[2]);

if(prefix.empty() && suffix.empty())
cameraName = std::string("Undefined") + "_" + cameraName;
else
cameraName = prefix + "frame" + suffix + "_" + cameraName;
if(prefix.empty() && suffix.empty())
cameraName = std::string("Undefined") + "_" + cameraName;
else
cameraName = prefix + "frame" + suffix + "_" + cameraName;

isSequence = true;
isSequence = true;
}

if(view.hasMetadataDateTimeOriginal()) // picture
{
const std::size_t key = view.getMetadataDateTimestamp();
ALICEVISION_LOG_TRACE("imagePathStem: " << imagePathStem << ", frameN: " << frameN << ", isSequence: " << isSequence << ", cameraName: " << cameraName);

dslrViewPerKey[cameraName].push_back({key, view.getViewId()});
}
else if(isSequence) // video
if(isSequence) // video
{
const std::size_t frame = frameN;
videoViewPerFrame[cameraName][frame] = view.getViewId();
}
else if(view.hasMetadataDateTimeOriginal()) // picture
{
const std::size_t key = view.getMetadataDateTimestamp();

dslrViewPerKey[cameraName].push_back({key, view.getViewId()});
}
else // no time or sequence information
{
dslrViewPerKey[cameraName].push_back({0, view.getViewId()});
dslrViewPerKey[cameraName].push_back({0, view.getViewId()});
}
}

Expand Down