updated to use DSHOW

This commit is contained in:
Jared Bruni
2020-05-20 01:26:35 -07:00
parent a45a36f23b
commit ec8d20d696
2 changed files with 6 additions and 0 deletions

View File

@@ -1501,6 +1501,8 @@ void AC_MainWindow::setFade() {
playback->setFadeFilter(fc); playback->setFadeFilter(fc);
} }
std::mutex mutex_lock_;
void AC_MainWindow::frameInc() { void AC_MainWindow::frameInc() {
frame_index++; frame_index++;
QString frame_string; QString frame_string;

View File

@@ -70,7 +70,11 @@ bool Playback::setVideoCamera(std::string name, int type, int device, int res, c
device_num = device; device_num = device;
mutex.lock(); mutex.lock();
//#if defined(__linux__) || defined(__APPLE__) //#if defined(__linux__) || defined(__APPLE__)
#ifdef _WIN32
capture.open(cv::CAP_DSHOW+device);
#else
capture.open(device); capture.open(device);
#endif
if(!capture.isOpened()) { if(!capture.isOpened()) {
mutex.unlock(); mutex.unlock();
return false; return false;