Updated CameraVideo and CameraStereoVideo constructor interface with USB

This commit is contained in:
matlabbe
2016-06-15 11:30:05 -04:00
parent bdafb9a3f1
commit 7b733686cb
5 changed files with 9 additions and 3 deletions

View File

@@ -696,10 +696,11 @@ SensorData CameraImages::captureImage()
/////////////////////////
CameraVideo::CameraVideo(
int usbDevice,
bool rectifyImages,
float imageRate,
const Transform & localTransform) :
Camera(imageRate, localTransform),
_rectifyImages(false),
_rectifyImages(rectifyImages),
_src(kUsbDevice),
_usbDevice(usbDevice)
{
@@ -812,7 +813,7 @@ SensorData CameraVideo::captureImage()
_model.setImageSize(img.size());
}
if(_model.isValidForRectification() && (_src != kVideoFile || _rectifyImages))
if(_model.isValidForRectification() && _rectifyImages)
{
img = _model.rectifyImage(img);
}

View File

@@ -1141,11 +1141,12 @@ CameraStereoVideo::CameraStereoVideo(
CameraStereoVideo::CameraStereoVideo(
int device,
bool rectifyImages,
float imageRate,
const Transform & localTransform) :
Camera(imageRate, localTransform),
path_(""),
rectifyImages_(false),
rectifyImages_(rectifyImages),
src_(CameraVideo::kUsbDevice),
usbDevice_(device)
{