diff --git a/src/openpose/filestream/jsonOfstream.cpp b/src/openpose/filestream/jsonOfstream.cpp index c82f9ea676450956f6ec3b1169c6efd0197026da..a3ee6044ad7fc3f3164b46d3508c57930c1e747e 100644 --- a/src/openpose/filestream/jsonOfstream.cpp +++ b/src/openpose/filestream/jsonOfstream.cpp @@ -2,7 +2,8 @@ namespace op { - void enterAndTab(std::ofstream& ofstream, const bool humanReadable, const long long bracesCounter, const long long bracketsCounter) + void enterAndTab(std::ofstream& ofstream, const bool humanReadable, const long long bracesCounter, + const long long bracketsCounter) { try { diff --git a/src/openpose/producer/ipCameraReader.cpp b/src/openpose/producer/ipCameraReader.cpp index 1776ddc972d92e8c1b4c0651ec955f81434a491f..48a7149cccc577ff657888dfc31b415bb3f50a98 100644 --- a/src/openpose/producer/ipCameraReader.cpp +++ b/src/openpose/producer/ipCameraReader.cpp @@ -16,7 +16,7 @@ namespace op { try { - return mPathName + "_" + VideoCaptureReader::getFrameName(); + return VideoCaptureReader::getFrameName(); } catch (const std::exception& e) { diff --git a/src/openpose/producer/webcamReader.cpp b/src/openpose/producer/webcamReader.cpp index 1bf3af0a9aafd95d3b68770c862154b6d393283d..8bddeecca77f88dfc2fdb0cb078eaf2544358751 100644 --- a/src/openpose/producer/webcamReader.cpp +++ b/src/openpose/producer/webcamReader.cpp @@ -4,7 +4,8 @@ namespace op { - WebcamReader::WebcamReader(const int webcamIndex, const Point& webcamResolution, const double fps, const bool throwExceptionIfNoOpened) : + WebcamReader::WebcamReader(const int webcamIndex, const Point& webcamResolution, const double fps, + const bool throwExceptionIfNoOpened) : VideoCaptureReader{webcamIndex, throwExceptionIfNoOpened}, mFps{fps}, mFrameNameCounter{-1}, @@ -18,11 +19,14 @@ namespace op { set(CV_CAP_PROP_FRAME_WIDTH, webcamResolution.x); set(CV_CAP_PROP_FRAME_HEIGHT, webcamResolution.y); - if ((int)get(CV_CAP_PROP_FRAME_WIDTH) != webcamResolution.x || (int)get(CV_CAP_PROP_FRAME_HEIGHT) != webcamResolution.y) + if ((int)get(CV_CAP_PROP_FRAME_WIDTH) != webcamResolution.x + || (int)get(CV_CAP_PROP_FRAME_HEIGHT) != webcamResolution.y) { - const std::string logMessage{ "Desired webcam resolution " + std::to_string(webcamResolution.x) + "x" + std::to_string(webcamResolution.y) - + " could not being set. Final resolution: " + std::to_string(intRound(get(CV_CAP_PROP_FRAME_WIDTH))) + "x" - + std::to_string(intRound(get(CV_CAP_PROP_FRAME_HEIGHT))) }; + const std::string logMessage{ "Desired webcam resolution " + std::to_string(webcamResolution.x) + + "x" + std::to_string(webcamResolution.y) + + " could not being set. Final resolution: " + + std::to_string(intRound(get(CV_CAP_PROP_FRAME_WIDTH))) + "x" + + std::to_string(intRound(get(CV_CAP_PROP_FRAME_HEIGHT))) }; log(logMessage, Priority::Max, __LINE__, __FUNCTION__, __FILE__); } }