Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Thiago Santini
EyeRecToo
Commits
f6960011
Commit
f6960011
authored
Dec 24, 2017
by
Thiago Santini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds prefered selections for new pupil labs camera
parent
b7022930
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
5 deletions
+21
-5
EyeRecToo/src/Camera.cpp
EyeRecToo/src/Camera.cpp
+21
-5
No files found.
EyeRecToo/src/Camera.cpp
View file @
f6960011
...
...
@@ -61,14 +61,15 @@ QCameraViewfinderSettings Camera::getViewfinderSettings(const QCameraInfo camera
// Recommend based on known cameras
QString
description
=
cameraInfo
.
description
();
if
(
description
==
"Pupil Cam1 ID0"
)
{
recommended
.
setMaximumFrameRate
(
90
);
recommended
.
setMinimumFrameRate
(
90
);
if
(
description
==
"Pupil Cam1 ID0"
)
{
// Pupil V1
recommended
.
setMaximumFrameRate
(
60
);
recommended
.
setMinimumFrameRate
(
60
);
recommended
.
setResolution
(
640
,
480
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
if
(
description
==
"Pupil Cam1 ID1"
)
{
recommended
.
setMaximumFrameRate
(
9
0
);
recommended
.
setMinimumFrameRate
(
9
0
);
recommended
.
setMaximumFrameRate
(
6
0
);
recommended
.
setMinimumFrameRate
(
6
0
);
recommended
.
setResolution
(
640
,
480
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
if
(
description
==
"Pupil Cam1 ID2"
)
{
...
...
@@ -76,6 +77,21 @@ QCameraViewfinderSettings Camera::getViewfinderSettings(const QCameraInfo camera
recommended
.
setMinimumFrameRate
(
30
);
recommended
.
setResolution
(
1280
,
720
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
if
(
description
==
"Pupil Cam2 ID0"
)
{
// Pupil V2
recommended
.
setMaximumFrameRate
(
60
);
recommended
.
setMinimumFrameRate
(
60
);
recommended
.
setResolution
(
320
,
240
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
if
(
description
==
"Pupil Cam2 ID1"
)
{
recommended
.
setMaximumFrameRate
(
60
);
recommended
.
setMinimumFrameRate
(
60
);
recommended
.
setResolution
(
320
,
240
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
if
(
description
==
"Pupil Cam2 ID2"
)
{
recommended
.
setMaximumFrameRate
(
30
);
recommended
.
setMinimumFrameRate
(
30
);
recommended
.
setResolution
(
1280
,
720
);
recommended
.
setPixelFormat
(
QVideoFrame
::
Format_Jpeg
);
}
else
{
// Unknown; recommend to maximize fps and minimize resolution
recommended
=
camera
->
viewfinderSettings
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment