提交 7a65ffa8 编写于 作者: G gineshidalgo99

Folder cameraParameters not required for video/image always

上级 e3b80524
......@@ -74,7 +74,7 @@ namespace op
else if (numberBodyParts == 23)
indexesInCocoOrder = std::vector<int>{18,21,19,22,20, 4,1,5,2,6, 3,13,8,14, 9, 15,10};
else
error("Unvalid number of body parts (" + std::to_string(numberBodyParts) + ").",
error("Invalid number of body parts (" + std::to_string(numberBodyParts) + ").",
__LINE__, __FUNCTION__, __FILE__);
for (auto bodyPart = 0u ; bodyPart < indexesInCocoOrder.size() ; bodyPart++)
{
......
......@@ -41,22 +41,25 @@ namespace op
{
try
{
// Read camera parameters from SN
auto serialNumbers = getFilesOnDirectory(cameraParameterPath, ".xml");
// Security check
if (serialNumbers.size() != mImageDirectoryStereo && mImageDirectoryStereo > 1)
error("Found different number of camera parameter files than the number indicated by"
" `--3d_views` ("
+ std::to_string(serialNumbers.size()) + " vs. "
+ std::to_string(mImageDirectoryStereo) + "). Make them equal or add"
+ " `--3d_views 1`",
__LINE__, __FUNCTION__, __FILE__);
// Get serial numbers
for (auto& serialNumber : serialNumbers)
serialNumber = getFileNameNoExtension(serialNumber);
// Get camera paremeters
if (mImageDirectoryStereo > 1)
// If stereo setting --> load camera parameters
if (imageDirectoryStereo > 1)
{
// Read camera parameters from SN
auto serialNumbers = getFilesOnDirectory(cameraParameterPath, ".xml");
// Security check
if (serialNumbers.size() != mImageDirectoryStereo && mImageDirectoryStereo > 1)
error("Found different number of camera parameter files than the number indicated by"
" `--3d_views` ("
+ std::to_string(serialNumbers.size()) + " vs. "
+ std::to_string(mImageDirectoryStereo) + "). Make them equal or add"
+ " `--3d_views 1`",
__LINE__, __FUNCTION__, __FILE__);
// Get serial numbers
for (auto& serialNumber : serialNumbers)
serialNumber = getFileNameNoExtension(serialNumber);
// Get camera paremeters
mCameraParameterReader.readParameters(cameraParameterPath, serialNumbers);
}
}
catch (const std::exception& e)
{
......
......@@ -67,7 +67,7 @@ namespace op
flipAndRotate(frame);
// Check frame integrity
checkFrameIntegrity(frame);
// If any frame unvalid --> exit
// If any frame invalid --> exit
if (frame.empty())
{
frames.clear();
......
......@@ -11,26 +11,27 @@ namespace op
{
try
{
// Read camera parameters from SN
auto serialNumbers = getFilesOnDirectory(cameraParameterPath, ".xml");
// Security check
if (serialNumbers.size() != mImageDirectoryStereo && mImageDirectoryStereo > 1)
error("Found different number of camera parameter files than the number indicated by"
" `--3d_views` ("
+ std::to_string(serialNumbers.size()) + " vs. "
+ std::to_string(mImageDirectoryStereo) + "). Make them equal or add"
+ " `--3d_views 1`",
__LINE__, __FUNCTION__, __FILE__);
// Get serial numbers
for (auto& serialNumber : serialNumbers)
serialNumber = getFileNameNoExtension(serialNumber);
// Get camera paremeters
if (mImageDirectoryStereo > 1)
// If stereo setting --> load camera parameters
if (imageDirectoryStereo > 1)
{
// Read camera parameters from SN
auto serialNumbers = getFilesOnDirectory(cameraParameterPath, ".xml");
// Security check
if (serialNumbers.size() != mImageDirectoryStereo && mImageDirectoryStereo > 1)
error("Found different number of camera parameter files than the number indicated by"
" `--3d_views` ("
+ std::to_string(serialNumbers.size()) + " vs. "
+ std::to_string(mImageDirectoryStereo) + "). Make them equal or add"
+ " `--3d_views 1`",
__LINE__, __FUNCTION__, __FILE__);
// Get serial numbers
for (auto& serialNumber : serialNumbers)
serialNumber = getFileNameNoExtension(serialNumber);
// Get camera paremeters
mCameraParameterReader.readParameters(cameraParameterPath, serialNumbers);
// Set video size
if (mImageDirectoryStereo > 1)
// Set video size
set(CV_CAP_PROP_FRAME_WIDTH, get(CV_CAP_PROP_FRAME_WIDTH)/mImageDirectoryStereo);
// set(CV_CAP_PROP_FRAME_HEIGHT)
}
}
catch (const std::exception& e)
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册