Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Limit the rate at which we acquire images, since OS X doesn't block like Linux

Browse source 
does.
This commit is contained in:
Andrzej Kapolka 2013-06-18 14:37:24 -07:00
parent e98d1f9a92
commit e1f76b2bdf
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Webcam.cpp
View file

@ -5,6 +5,7 @@
// Created by Andrzej Kapolka on 6/17/13. // Created by Andrzej Kapolka on 6/17/13.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
#include <QTimer>
#include <QtDebug> #include <QtDebug>
#include <opencv2/opencv.hpp> #include <opencv2/opencv.hpp>
@ -26,7 +27,7 @@ void Webcam::init() {
_grabberThread.start(); _grabberThread.start();
// remember when we started // remember when we started
_startTimestamp = usecTimestampNow(); _startTimestamp = _lastFrameTimestamp = usecTimestampNow();
// let the grabber know we're ready for the first frame // let the grabber know we're ready for the first frame
QMetaObject::invokeMethod(_grabber, "grabFrame"); QMetaObject::invokeMethod(_grabber, "grabFrame");
@ -78,7 +79,7 @@ void Webcam::setFrame(void* image) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _frameWidth = img->width, _frameHeight = img->height, 0, GL_BGR, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _frameWidth = img->width, _frameHeight = img->height, 0, GL_BGR,
GL_UNSIGNED_BYTE, img->imageData); GL_UNSIGNED_BYTE, img->imageData);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
printLog("Capturing webcam at %dx%dx%d.\n", _frameWidth, _frameHeight, _grabber->getFramesPerSecond()); printLog("Capturing webcam at %dx%d.\n", _frameWidth, _frameHeight);
} else { } else {
glBindTexture(GL_TEXTURE_2D, _frameTextureID); glBindTexture(GL_TEXTURE_2D, _frameTextureID);
@ -90,8 +91,14 @@ void Webcam::setFrame(void* image) {
// update our frame count for fps computation // update our frame count for fps computation
_frameCount++; _frameCount++;
const int MAX_FPS = 60;
const int MIN_FRAME_DELAY = 1000000 / MAX_FPS;
long long now = usecTimestampNow();
long long remaining = MIN_FRAME_DELAY - (now - _lastFrameTimestamp);
_lastFrameTimestamp = now;
// let the grabber know we're ready for the next frame // let the grabber know we're ready for the next frame
QMetaObject::invokeMethod(_grabber, "grabFrame"); QTimer::singleShot(qMax((int)remaining / 1000, 0), _grabber, SLOT(grabFrame()));
} }
FrameGrabber::~FrameGrabber() { FrameGrabber::~FrameGrabber() {
@ -108,11 +115,8 @@ void FrameGrabber::grabFrame() {
} }
const int IDEAL_FRAME_WIDTH = 320; const int IDEAL_FRAME_WIDTH = 320;
const int IDEAL_FRAME_HEIGHT = 240; const int IDEAL_FRAME_HEIGHT = 240;
const int IDEAL_FPS = 60;
cvSetCaptureProperty(_capture, CV_CAP_PROP_FRAME_WIDTH, IDEAL_FRAME_WIDTH); cvSetCaptureProperty(_capture, CV_CAP_PROP_FRAME_WIDTH, IDEAL_FRAME_WIDTH);
cvSetCaptureProperty(_capture, CV_CAP_PROP_FRAME_HEIGHT, IDEAL_FRAME_HEIGHT); cvSetCaptureProperty(_capture, CV_CAP_PROP_FRAME_HEIGHT, IDEAL_FRAME_HEIGHT);
cvSetCaptureProperty(_capture, CV_CAP_PROP_FPS, IDEAL_FPS);
_framesPerSecond = cvGetCaptureProperty(_capture, CV_CAP_PROP_FPS);
} }
IplImage* image = cvQueryFrame(_capture); IplImage* image = cvQueryFrame(_capture);
if (image == 0) { if (image == 0) {

5
interface/src/Webcam.h
View file

@ -46,6 +46,8 @@ private:
long long _startTimestamp; long long _startTimestamp;
int _frameCount; int _frameCount;
long long _lastFrameTimestamp;
}; };
class FrameGrabber : public QObject { class FrameGrabber : public QObject {
@ -56,8 +58,6 @@ public:
FrameGrabber() : _capture(0) { } FrameGrabber() : _capture(0) { }
virtual ~FrameGrabber(); virtual ~FrameGrabber();
int getFramesPerSecond() const { return _framesPerSecond; }
public slots: public slots:
void grabFrame(); void grabFrame();
@ -65,7 +65,6 @@ public slots:
private: private:
CvCapture* _capture; CvCapture* _capture;
int _framesPerSecond;
}; };
#endif /* defined(__interface__Webcam__) */ #endif /* defined(__interface__Webcam__) */