ofVideoGrabber: desiredFramerate was not being set if called before init

Closes openframeworks#769
netconstructor · Oct 10, 2011 · 04f44b0 · 04f44b0
1 parent be2b260
commit 04f44b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/libs/openFrameworks/video/ofVideoGrabber.cpp b/libs/openFrameworks/video/ofVideoGrabber.cpp
@@ -19,6 +19,7 @@ ofVideoGrabber::ofVideoGrabber(){
 	bInitialized		= false;
 	RequestedDeviceID	= -1;
 	internalPixelFormat = OF_PIXELS_RGB;
+	desiredFramerate 	= -1;
 
 #ifdef TARGET_ANDROID
 	if(!ofxAndroidInitGrabber(this)) return;
@@ -63,6 +64,10 @@ bool ofVideoGrabber::initGrabber(int w, int h, bool setUseTexture){
 
 	grabber->setPixelFormat(internalPixelFormat);
 
+	if( desiredFramerate!=-1 ){
+		grabber->setDesiredFrameRate(desiredFramerate);
+	}
+
 	bool bOk = grabber->initGrabber(w, h);
 	width	 = (int)grabber->getWidth();
 	height	 = (int)grabber->getHeight();
@@ -118,6 +123,7 @@ void ofVideoGrabber::setDeviceID(int _deviceID){
 
 //--------------------------------------------------------------------
 void ofVideoGrabber::setDesiredFrameRate(int framerate){
+	desiredFramerate = framerate;
 	if(	grabber != NULL ){
 		grabber->setDesiredFrameRate(framerate);
 	}

diff --git a/libs/openFrameworks/video/ofVideoGrabber.h b/libs/openFrameworks/video/ofVideoGrabber.h
@@ -87,6 +87,7 @@ class ofVideoGrabber : public ofBaseVideoGrabber,public ofBaseVideoDraws{
 		int RequestedDeviceID;
 
 		ofPixelFormat internalPixelFormat;
+		int desiredFramerate;
 };