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

updated

Browse Source
This commit is contained in:
Jared Bruni
2019-10-06 16:50:54 -07:00
parent 517e584a61
commit 837362bb5c
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main_window.cpp
View File

@@ -904,7 +904,7 @@ bool AC_MainWindow::startCamera(int res, int dev, const QString &outdir, bool re
struct tm *m; struct tm *m;
m = localtime(&t); m = localtime(&t);
QString ext; QString ext;
if(type >= 0 && type < 3) if(type == 0)
ext = ".mp4"; ext = ".mp4";
else else
ext = ".avi"; ext = ".avi";
@@ -948,13 +948,7 @@ bool AC_MainWindow::startCamera(int res, int dev, const QString &outdir, bool re
case 0: case 0:
c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v'); c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v');
break; break;
case 1: case '1':
c_type = cv::VideoWriter::fourcc('a', 'v', 'c', '3');
break;
case 2:
c_type = cv::VideoWriter::fourcc('h', 'e', 'v', '1');
break;
case '3':
c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D'); c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D');
break; break;
} }
@@ -1025,7 +1019,7 @@ bool AC_MainWindow::startVideo(const QString &filename, const QString &outdir, b
struct tm *m; struct tm *m;
m = localtime(&t); m = localtime(&t);
QString ext; QString ext;
if(type >= 0 && type < 3) if(type == 0)
ext = ".mp4"; ext = ".mp4";
else else
ext = ".avi"; ext = ".avi";
@@ -1042,16 +1036,11 @@ bool AC_MainWindow::startVideo(const QString &filename, const QString &outdir, b
case 0: case 0:
c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v'); c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v');
break; break;
case 1: case '1':
c_type = cv::VideoWriter::fourcc('a', 'v', 'c', '1');
break;
case 2:
c_type = cv::VideoWriter::fourcc('h', 'e', 'v', '1');
break;
case '3':
c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D'); c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D');
break; break;
} }
writer = cv::VideoWriter(output_name.toStdString(), c_type, video_fps, cv::Size(res_w, res_h), true); writer = cv::VideoWriter(output_name.toStdString(), c_type, video_fps, cv::Size(res_w, res_h), true);
if(!writer.isOpened()) { if(!writer.isOpened()) {

4
src/new_dialog.cpp
View File

@@ -51,8 +51,6 @@ void CaptureCamera::createControls() {
video_type = new QComboBox(this); video_type = new QComboBox(this);
video_type->setGeometry(80, 90, 90, 25); video_type->setGeometry(80, 90, 90, 25);
video_type->addItem("MP4 - MPEG-4"); video_type->addItem("MP4 - MPEG-4");
video_type->addItem("MP4 - AVC");
video_type->addItem("MP4 - HEVC");
video_type->addItem("AVI - XviD"); video_type->addItem("AVI - XviD");
} }
@@ -122,8 +120,6 @@ void CaptureVideo::createControls() {
video_type = new QComboBox(this); video_type = new QComboBox(this);
video_type->setGeometry(180, 55, 120, 25); video_type->setGeometry(180, 55, 120, 25);
video_type->addItem("MP4 - MPEG-4"); video_type->addItem("MP4 - MPEG-4");
video_type->addItem("MP4 - AVC");
video_type->addItem("MP4 - HEVC");
video_type->addItem("AVI - XviD"); video_type->addItem("AVI - XviD");
connect(btn_setedit, SIGNAL(clicked()), this, SLOT(btn_SetSourceFile())); connect(btn_setedit, SIGNAL(clicked()), this, SLOT(btn_SetSourceFile()));
connect(btn_setout, SIGNAL(clicked()), this, SLOT(btn_SetOutputDir())); connect(btn_setout, SIGNAL(clicked()), this, SLOT(btn_SetOutputDir()));