This commit is contained in:
Jared Bruni
2021-09-04 11:07:41 -07:00
parent 59d0359f48
commit 9975d5d04d
2 changed files with 3 additions and 5 deletions

View File

@@ -435,11 +435,9 @@ void Playback::run() {
mutex.unlock(); mutex.unlock();
if(single_mode == true && alpha > 0) { if(single_mode == true && alpha > 0) {
mutex.lock();
if(fadefilter == true) filterFade(frame, current_filter, prev_filter, alpha); if(fadefilter == true) filterFade(frame, current_filter, prev_filter, alpha);
drawEffects(frame); drawEffects(frame);
alpha -= 0.08; alpha = alpha-0.08;
mutex.unlock();
} else if(single_mode == true) { } else if(single_mode == true) {
mutex.lock(); mutex.lock();
ac::setSubFilter(-1); ac::setSubFilter(-1);

View File

@@ -22,7 +22,7 @@ private:
QMutex mutex, mutex_shown, mutex_add; QMutex mutex, mutex_shown, mutex_add;
QWaitCondition condition; QWaitCondition condition;
cv::Mat frame; cv::Mat frame;
double frame_rate; std::atomic<double> frame_rate;
std::atomic<bool> recording; std::atomic<bool> recording;
cv::VideoCapture capture; cv::VideoCapture capture;
cv::VideoWriter writer; cv::VideoWriter writer;
@@ -41,7 +41,7 @@ private:
std::atomic<unsigned int> bright_, gamma_, saturation_; std::atomic<unsigned int> bright_, gamma_, saturation_;
std::atomic<bool> single_mode; std::atomic<bool> single_mode;
FilterValue current_filter, prev_filter; FilterValue current_filter, prev_filter;
double alpha; std::atomic<double> alpha;
std::atomic<bool> flip_frame1, flip_frame2; std::atomic<bool> flip_frame1, flip_frame2;
std::atomic<bool> repeat_video; std::atomic<bool> repeat_video;
std::atomic<bool> fadefilter; std::atomic<bool> fadefilter;