diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp index 23702c526a..aaa6cf5311 100644 --- a/interface/src/Webcam.cpp +++ b/interface/src/Webcam.cpp @@ -78,7 +78,7 @@ void Webcam::setFrame(void* image) { glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _frameWidth = img->width, _frameHeight = img->height, 0, GL_BGR, GL_UNSIGNED_BYTE, img->imageData); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - printLog("Capturing webcam at %dx%d.\n", _frameWidth, _frameHeight); + printLog("Capturing webcam at %dx%dx%d.\n", _frameWidth, _frameHeight, _grabber->getFramesPerSecond()); } else { glBindTexture(GL_TEXTURE_2D, _frameTextureID); @@ -112,6 +112,7 @@ void FrameGrabber::grabFrame() { 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_FPS, IDEAL_FPS); + _framesPerSecond = cvGetCaptureProperty(_capture, CV_CAP_PROP_FPS); } IplImage* image = cvQueryFrame(_capture); if (image == 0) { diff --git a/interface/src/Webcam.h b/interface/src/Webcam.h index 2070b1445c..dc8f3d364d 100644 --- a/interface/src/Webcam.h +++ b/interface/src/Webcam.h @@ -56,6 +56,8 @@ public: FrameGrabber() : _capture(0) { } virtual ~FrameGrabber(); + int getFramesPerSecond() const { return _framesPerSecond; } + public slots: void grabFrame(); @@ -63,6 +65,7 @@ public slots: private: CvCapture* _capture; + int _framesPerSecond; }; #endif /* defined(__interface__Webcam__) */