From 626407999d3f83dbc0f422b0f00fcace592e851f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 26 Feb 2022 12:14:01 +0100 Subject: tracker/aruco: allow use of mjpeg compression Issue: #1431 --- tracker-aruco/aruco-trackercontrols.ui | 88 +++++++++++++++++++++------------- tracker-aruco/ftnoir_tracker_aruco.cpp | 3 ++ tracker-aruco/ftnoir_tracker_aruco.h | 1 + tracker-aruco/lang/nl_NL.ts | 4 ++ tracker-aruco/lang/ru_RU.ts | 4 ++ tracker-aruco/lang/stub.ts | 4 ++ tracker-aruco/lang/zh_CN.ts | 4 ++ 7 files changed, 74 insertions(+), 34 deletions(-) diff --git a/tracker-aruco/aruco-trackercontrols.ui b/tracker-aruco/aruco-trackercontrols.ui index 4d40b6ef..0cd76b89 100644 --- a/tracker-aruco/aruco-trackercontrols.ui +++ b/tracker-aruco/aruco-trackercontrols.ui @@ -9,8 +9,8 @@ 0 0 - 462 - 221 + 457 + 230 @@ -64,13 +64,17 @@ - - - - - 0 - 0 - + + + + Resolution + + + + + + + Camera name @@ -93,7 +97,24 @@ - + + + + Frames per second + + + + + + + + 0 + 0 + + + + + @@ -123,27 +144,6 @@ - - - - Frames per second - - - - - - - Resolution - - - - - - - Camera name - - - @@ -151,8 +151,8 @@ - - + + 0 @@ -161,7 +161,7 @@ - + @@ -174,6 +174,26 @@ + + + + MJPEG + + + + + + + + 0 + 0 + + + + + + + diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp index 4e31d90d..1f39db32 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.cpp +++ b/tracker-aruco/ftnoir_tracker_aruco.cpp @@ -179,6 +179,8 @@ bool aruco_tracker::open_camera() if (fps) args.fps = fps; + args.use_mjpeg = s.use_mjpeg; + if (!camera->start(args)) { qDebug() << "aruco tracker: can't open camera"; @@ -526,6 +528,7 @@ aruco_dialog::aruco_dialog() : tie_setting(s.headpos_x, ui.cx); tie_setting(s.headpos_y, ui.cy); tie_setting(s.headpos_z, ui.cz); + tie_setting(s.use_mjpeg, ui.use_mjpeg); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h index 3c50ada0..839be6d5 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.h +++ b/tracker-aruco/ftnoir_tracker_aruco.h @@ -62,6 +62,7 @@ struct settings : opts { value resolution { b, "force-resolution", 0 }; value fov { b, "field-of-view", 56 }; value force_fps { b, "force-fps", fps_default }; + value use_mjpeg { b, "use-mjpeg", false }; settings(); }; diff --git a/tracker-aruco/lang/nl_NL.ts b/tracker-aruco/lang/nl_NL.ts index c9213ea0..1a510ac1 100644 --- a/tracker-aruco/lang/nl_NL.ts +++ b/tracker-aruco/lang/nl_NL.ts @@ -63,6 +63,10 @@ 1280x720 1280x720 + + MJPEG + + aruco_dialog diff --git a/tracker-aruco/lang/ru_RU.ts b/tracker-aruco/lang/ru_RU.ts index f78a7cae..3e0aa86a 100644 --- a/tracker-aruco/lang/ru_RU.ts +++ b/tracker-aruco/lang/ru_RU.ts @@ -63,6 +63,10 @@ 1280x720 + + MJPEG + + aruco_dialog diff --git a/tracker-aruco/lang/stub.ts b/tracker-aruco/lang/stub.ts index 82ccd296..bbd78995 100644 --- a/tracker-aruco/lang/stub.ts +++ b/tracker-aruco/lang/stub.ts @@ -63,6 +63,10 @@ 1280x720 + + MJPEG + + aruco_dialog diff --git a/tracker-aruco/lang/zh_CN.ts b/tracker-aruco/lang/zh_CN.ts index e060c387..88b1054c 100644 --- a/tracker-aruco/lang/zh_CN.ts +++ b/tracker-aruco/lang/zh_CN.ts @@ -63,6 +63,10 @@ 1280x720 + + MJPEG + + aruco_dialog -- cgit v1.2.3