tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-s-sdk into develop

Browse Source
This commit is contained in:
Osenberg
2019-03-15 19:46:30 +08:00
parent ccf7e7cb08 272ba40b68
commit cdbe614072
8 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mynteye/device/device.cc
View File

@@ -657,7 +657,18 @@ void Device::UpdateStreamIntrinsics(
img_res.height == request.GetResolution().height &&
img_res.width == request.GetResolution().width / 2;
} else if (capability == Capabilities::STEREO) {
ok = img_params.ok && img_res == request.GetResolution();
if (img_res == request.GetResolution()) {
ok = img_params.ok;
} else if (request.GetResolution().height / img_res.height ==
request.GetResolution().width / img_res.width) {
double scale = static_cast<double> (
1.0 * request.GetResolution().height / img_res.height);
img_params.in_left->resize_scale = scale;
img_params.in_right->resize_scale = scale;
ok = img_params.ok;
} else {
ok = false;
}
}
if (ok) {
SetIntrinsics(Stream::LEFT, img_params.in_left);