提交 cb06fded 编写于 作者: G gineshidalgo99

Fixed #433

上级 ce62c530
......@@ -97,6 +97,7 @@ namespace op
spVideoSeek->second = 0;
}
}
auto nextFrameName = spProducer->getNextFrameName();
auto cvMats = spProducer->getFrames();
auto cameraMatrices = spProducer->getCameraMatrices();
// Check frames are not empty
......@@ -107,7 +108,7 @@ namespace op
// Datum cannot be assigned before resize()
auto& datum = (*datums)[0];
// Filling first element
datum.name = spProducer->getFrameName();
std::swap(datum.name, nextFrameName);
datum.cvInputData = cvMats[0];
if (!cameraMatrices.empty())
datum.cameraMatrix = cameraMatrices[0];
......
......@@ -24,7 +24,7 @@ namespace op
std::vector<cv::Mat> getCameraMatrices();
std::string getFrameName();
std::string getNextFrameName();
bool isOpened() const;
......
......@@ -23,7 +23,7 @@ namespace op
std::vector<cv::Mat> getCameraMatrices();
std::string getFrameName();
std::string getNextFrameName();
inline bool isOpened() const
{
......
......@@ -20,7 +20,7 @@ namespace op
std::vector<cv::Mat> getCameraMatrices();
std::string getFrameName();
std::string getNextFrameName();
inline double get(const int capProperty)
{
......
......@@ -52,7 +52,7 @@ namespace op
* frame counter for webcam, the image name for image directory reader, etc.).
* @return std::string with an unique frame name.
*/
virtual std::string getFrameName() = 0;
virtual std::string getNextFrameName() = 0;
/**
* This function sets whether the producer must keep the original fps frame rate or extract the frames as quick
......
......@@ -34,7 +34,7 @@ namespace op
*/
virtual ~VideoCaptureReader();
virtual std::string getFrameName() = 0;
virtual std::string getNextFrameName() = 0;
inline bool isOpened() const
{
......
......@@ -22,7 +22,7 @@ namespace op
std::vector<cv::Mat> getCameraMatrices();
std::string getFrameName();
std::string getNextFrameName();
inline double get(const int capProperty)
{
......
......@@ -31,7 +31,7 @@ namespace op
std::vector<cv::Mat> getCameraMatrices();
std::string getFrameName();
std::string getNextFrameName();
double get(const int capProperty);
......
......@@ -46,7 +46,7 @@ namespace op
}
}
std::string FlirReader::getFrameName()
std::string FlirReader::getNextFrameName()
{
try
{
......
......@@ -51,7 +51,7 @@ namespace op
}
}
std::string ImageDirectoryReader::getFrameName()
std::string ImageDirectoryReader::getNextFrameName()
{
try
{
......
......@@ -25,11 +25,11 @@ namespace op
}
}
std::string IpCameraReader::getFrameName()
std::string IpCameraReader::getNextFrameName()
{
try
{
return VideoCaptureReader::getFrameName();
return VideoCaptureReader::getNextFrameName();
}
catch (const std::exception& e)
{
......
......@@ -54,7 +54,7 @@ namespace op
}
}
std::string VideoCaptureReader::getFrameName()
std::string VideoCaptureReader::getNextFrameName()
{
try
{
......
......@@ -22,11 +22,11 @@ namespace op
}
}
std::string VideoReader::getFrameName()
std::string VideoReader::getNextFrameName()
{
try
{
return mPathName + "_" + VideoCaptureReader::getFrameName();
return mPathName + "_" + VideoCaptureReader::getNextFrameName();
}
catch (const std::exception& e)
{
......
......@@ -71,11 +71,11 @@ namespace op
}
}
std::string WebcamReader::getFrameName()
std::string WebcamReader::getNextFrameName()
{
try
{
return VideoCaptureReader::getFrameName();
return VideoCaptureReader::getNextFrameName();
}
catch (const std::exception& e)
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册