From cb06fdeda89edaf8ee11a33203c464e225b8d881 Mon Sep 17 00:00:00 2001 From: gineshidalgo99 Date: Thu, 15 Feb 2018 01:00:26 -0500 Subject: [PATCH] Fixed #433 --- include/openpose/producer/datumProducer.hpp | 3 ++- include/openpose/producer/flirReader.hpp | 2 +- include/openpose/producer/imageDirectoryReader.hpp | 2 +- include/openpose/producer/ipCameraReader.hpp | 2 +- include/openpose/producer/producer.hpp | 2 +- include/openpose/producer/videoCaptureReader.hpp | 2 +- include/openpose/producer/videoReader.hpp | 2 +- include/openpose/producer/webcamReader.hpp | 2 +- src/openpose/producer/flirReader.cpp | 2 +- src/openpose/producer/imageDirectoryReader.cpp | 2 +- src/openpose/producer/ipCameraReader.cpp | 4 ++-- src/openpose/producer/videoCaptureReader.cpp | 2 +- src/openpose/producer/videoReader.cpp | 4 ++-- src/openpose/producer/webcamReader.cpp | 4 ++-- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/openpose/producer/datumProducer.hpp b/include/openpose/producer/datumProducer.hpp index 1fed2990..41787b84 100644 --- a/include/openpose/producer/datumProducer.hpp +++ b/include/openpose/producer/datumProducer.hpp @@ -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]; diff --git a/include/openpose/producer/flirReader.hpp b/include/openpose/producer/flirReader.hpp index c5d9af1d..500d7925 100644 --- a/include/openpose/producer/flirReader.hpp +++ b/include/openpose/producer/flirReader.hpp @@ -24,7 +24,7 @@ namespace op std::vector getCameraMatrices(); - std::string getFrameName(); + std::string getNextFrameName(); bool isOpened() const; diff --git a/include/openpose/producer/imageDirectoryReader.hpp b/include/openpose/producer/imageDirectoryReader.hpp index 238180fc..28ffc72c 100644 --- a/include/openpose/producer/imageDirectoryReader.hpp +++ b/include/openpose/producer/imageDirectoryReader.hpp @@ -23,7 +23,7 @@ namespace op std::vector getCameraMatrices(); - std::string getFrameName(); + std::string getNextFrameName(); inline bool isOpened() const { diff --git a/include/openpose/producer/ipCameraReader.hpp b/include/openpose/producer/ipCameraReader.hpp index ba512966..6d927469 100644 --- a/include/openpose/producer/ipCameraReader.hpp +++ b/include/openpose/producer/ipCameraReader.hpp @@ -20,7 +20,7 @@ namespace op std::vector getCameraMatrices(); - std::string getFrameName(); + std::string getNextFrameName(); inline double get(const int capProperty) { diff --git a/include/openpose/producer/producer.hpp b/include/openpose/producer/producer.hpp index 99a9ba19..129b507e 100644 --- a/include/openpose/producer/producer.hpp +++ b/include/openpose/producer/producer.hpp @@ -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 diff --git a/include/openpose/producer/videoCaptureReader.hpp b/include/openpose/producer/videoCaptureReader.hpp index a0cceb5c..1dea5bca 100644 --- a/include/openpose/producer/videoCaptureReader.hpp +++ b/include/openpose/producer/videoCaptureReader.hpp @@ -34,7 +34,7 @@ namespace op */ virtual ~VideoCaptureReader(); - virtual std::string getFrameName() = 0; + virtual std::string getNextFrameName() = 0; inline bool isOpened() const { diff --git a/include/openpose/producer/videoReader.hpp b/include/openpose/producer/videoReader.hpp index 4dc0204f..b9694cbc 100644 --- a/include/openpose/producer/videoReader.hpp +++ b/include/openpose/producer/videoReader.hpp @@ -22,7 +22,7 @@ namespace op std::vector getCameraMatrices(); - std::string getFrameName(); + std::string getNextFrameName(); inline double get(const int capProperty) { diff --git a/include/openpose/producer/webcamReader.hpp b/include/openpose/producer/webcamReader.hpp index 4b293cc2..6f47b1a8 100644 --- a/include/openpose/producer/webcamReader.hpp +++ b/include/openpose/producer/webcamReader.hpp @@ -31,7 +31,7 @@ namespace op std::vector getCameraMatrices(); - std::string getFrameName(); + std::string getNextFrameName(); double get(const int capProperty); diff --git a/src/openpose/producer/flirReader.cpp b/src/openpose/producer/flirReader.cpp index 62c21c92..7395e9c4 100644 --- a/src/openpose/producer/flirReader.cpp +++ b/src/openpose/producer/flirReader.cpp @@ -46,7 +46,7 @@ namespace op } } - std::string FlirReader::getFrameName() + std::string FlirReader::getNextFrameName() { try { diff --git a/src/openpose/producer/imageDirectoryReader.cpp b/src/openpose/producer/imageDirectoryReader.cpp index 4efc1635..966083e0 100644 --- a/src/openpose/producer/imageDirectoryReader.cpp +++ b/src/openpose/producer/imageDirectoryReader.cpp @@ -51,7 +51,7 @@ namespace op } } - std::string ImageDirectoryReader::getFrameName() + std::string ImageDirectoryReader::getNextFrameName() { try { diff --git a/src/openpose/producer/ipCameraReader.cpp b/src/openpose/producer/ipCameraReader.cpp index 2369e093..599938e7 100644 --- a/src/openpose/producer/ipCameraReader.cpp +++ b/src/openpose/producer/ipCameraReader.cpp @@ -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) { diff --git a/src/openpose/producer/videoCaptureReader.cpp b/src/openpose/producer/videoCaptureReader.cpp index b550edc0..962ec21c 100644 --- a/src/openpose/producer/videoCaptureReader.cpp +++ b/src/openpose/producer/videoCaptureReader.cpp @@ -54,7 +54,7 @@ namespace op } } - std::string VideoCaptureReader::getFrameName() + std::string VideoCaptureReader::getNextFrameName() { try { diff --git a/src/openpose/producer/videoReader.cpp b/src/openpose/producer/videoReader.cpp index 65490b45..253673dc 100644 --- a/src/openpose/producer/videoReader.cpp +++ b/src/openpose/producer/videoReader.cpp @@ -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) { diff --git a/src/openpose/producer/webcamReader.cpp b/src/openpose/producer/webcamReader.cpp index 199ade06..892ebf09 100644 --- a/src/openpose/producer/webcamReader.cpp +++ b/src/openpose/producer/webcamReader.cpp @@ -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) { -- GitLab