* Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing.

* Fixing the screenshot functionality.

* Feature/code cleanup (#573)

* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion

* Adding Visual Studio 2017 solution

* Feature/code cleanup (#580)

- name of revision
- better scripts for model download (not only in Dropbox also OneDrive)

* Update the OpenCV constants to the corresponding ones in cpp namespace. (#578)

Updating OpenCV macros.

* Slight change in packaging code (use a shared download script).

* Removing TBB dependency (#590)

Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_

* Updating OpenBLAS (#594)

Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)

* Ability to specify output image formats and removing unused quiet parameter.

* Update Windows download script (#608) (#610)

- Automatically choose correct path to the model files so that it works for both, source code compilation and binary use
- Use absolute paths in the system exists methods

* Updating version.

* Packaging code update.
This commit is contained in:
Tadas Baltrusaitis
2018-11-29 19:49:47 +00:00
committed by GitHub
parent be9b57703c
commit caaefae7d3
195 changed files with 408 additions and 45858 deletions

View File

@@ -39,14 +39,14 @@
#include <sstream>
#include <vector>
// For speeding up capture
#include "tbb/concurrent_queue.h"
#include "tbb/task_group.h"
#include <thread>
// OpenCV includes
#include <opencv2/core/core.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <ConcurrentQueue.h>
namespace Utilities
{
@@ -110,6 +110,8 @@ namespace Utilities
// Allows to differentiate if failed because no input specified or if failed to open a specified input
bool no_input_specified;
// Storing the captured data queue
static const int CAPTURE_CAPACITY = 200; // 200 MB
private:
@@ -119,7 +121,7 @@ namespace Utilities
bool capturing;
// For keeping track of tasks
tbb::task_group capture_threads;
std::thread capture_thread;
// A thread that will write video output, so that the rest of the application does not block on it
void CaptureThread();
@@ -137,11 +139,8 @@ namespace Utilities
cv::Mat latest_frame;
cv::Mat_<uchar> latest_gray_frame;
// Storing the captured data queue
const int CAPTURE_CAPACITY = 200; // 200 MB
// Storing capture timestamp, RGB image, gray image
tbb::concurrent_bounded_queue<std::tuple<double, cv::Mat, cv::Mat_<uchar> > > capture_queue;
ConcurrentQueue<std::tuple<double, cv::Mat, cv::Mat_<uchar> > > capture_queue;
// Keeping track of frame number and the files in the image sequence
size_t frame_num;