eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-18 12:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

worked around bug for MacOS X, now instead of closing camera, just leaves it open then next time it resizes to new resolution.

Browse Source
This commit is contained in:
lostjared
2017-03-05 13:29:14 -08:00
parent 555bb342c6
commit 977d4fe63d
6 changed files with 402 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/playback_thread.cpp
View File

@@ -17,6 +17,7 @@ void Playback::Play() {
}
void Playback::setVideo(cv::VideoCapture cap, cv::VideoWriter wr, bool record) {
mode = MODE_VIDEO;
mutex.lock();
capture = cap;
writer = wr;
@@ -28,6 +29,42 @@ void Playback::setVideo(cv::VideoCapture cap, cv::VideoWriter wr, bool record) {
mutex.unlock();
}
void Playback::setVideoCamera(int device, int res, cv::VideoWriter wr, bool record) {
mode = MODE_CAMERA;
mutex.lock();
if(capture.isOpened()) {
} else {
capture.open(device);
}
recording = record;
writer = wr;
int res_w = 0, res_h = 0, ores_w = 640, ores_h = 480;
switch(res) {
case 0:
res_w = 640;
res_h = 480;
break;
case 1:
res_w = 1280;
res_h = 720;
break;
case 2:
res_w = 1920;
res_h = 1080;
break;
}
bool cw = capture.set(CV_CAP_PROP_FRAME_WIDTH, res_w);
bool ch = capture.set(CV_CAP_PROP_FRAME_HEIGHT, res_h);
if(cw == false || ch == false) {
res_w = ores_w;
res_h = ores_h;
capture.set(CV_CAP_PROP_FRAME_WIDTH, res_w);
capture.set(CV_CAP_PROP_FRAME_HEIGHT, res_h);
}
mutex.unlock();
}
void Playback::setVector(std::vector<std::pair<int, int>> v) {
mutex_add.lock();
current = v;
@@ -126,7 +163,7 @@ void Playback::Stop() {
void Playback::Release() {
mutex.lock();
stop = true;
if(capture.isOpened()) capture.release();
if(capture.isOpened() && mode == MODE_VIDEO) capture.release();
if(writer.isOpened()) writer.release();
mutex.unlock();
}