mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 18:43:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23815 from LaurentBerger:CAP_IMAGES

Browse Source 
Add single image support to VideoCapture
This commit is contained in:
Alexander Smorkalov 2023-07-04 16:31:29 +03:00 committed by GitHub
commit 8839bd572e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/videoio/src/cap_images.cpp
View File

@ -113,7 +113,16 @@ void CvCapture_Images::close()
bool CvCapture_Images::grabFrame() bool CvCapture_Images::grabFrame()
{ {
cv::String filename = cv::format(filename_pattern.c_str(), (int)(firstframe + currentframe)); cv::String filename;
if (length == 1)
if (currentframe < length)
filename = filename_pattern;
else
{
return false;
}
else
filename = cv::format(filename_pattern.c_str(), (int)(firstframe + currentframe));
CV_Assert(!filename.empty()); CV_Assert(!filename.empty());
if (grabbedInOpen) if (grabbedInOpen)
@ -249,9 +258,7 @@ std::string icvExtractPattern(const std::string& filename, unsigned *offset)
while (pos < len && !isdigit(filename[pos])) pos++; while (pos < len && !isdigit(filename[pos])) pos++;
if (pos == len) if (pos == len)
{ return "";
CV_Error_(Error::StsBadArg, ("CAP_IMAGES: can't find starting number (in the name of file): %s", filename.c_str()));
}
std::string::size_type pos0 = pos; std::string::size_type pos0 = pos;
@ -292,7 +299,25 @@ bool CvCapture_Images::open(const std::string& _filename)
CV_Assert(!_filename.empty()); CV_Assert(!_filename.empty());
filename_pattern = icvExtractPattern(_filename, &offset); filename_pattern = icvExtractPattern(_filename, &offset);
CV_Assert(!filename_pattern.empty()); if (filename_pattern.empty())
{
filename_pattern = _filename;
cv::String filename = _filename.c_str();
if (!utils::fs::exists(filename))
{
return false;
}
if (!haveImageReader(filename))
{
CV_LOG_INFO(NULL, "CAP_IMAGES: Stop scanning. Can't read image file: " << filename);
}
length = 1;
// grab frame to enable properties retrieval
bool grabRes = grabFrame();
grabbedInOpen = true;
currentframe = 0;
return grabRes;
}
// determine the length of the sequence // determine the length of the sequence
for (length = 0; ;) for (length = 0; ;)