generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Little fix for multicast (we'll testing in a real multicast environment in the next days)

Browse Source
This commit is contained in:
Stefano Fabri 2011-06-08 12:44:01 +00:00
parent c71e24cd96
commit 715b5d0c55
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/highgui/src/cap_pvapi.cpp
View File

@ -58,6 +58,7 @@
#include <PvApi.h> #include <PvApi.h>
#include <unistd.h> #include <unistd.h>
#include <string>
//#include <arpa/inet.h> //#include <arpa/inet.h>
#define MAX_CAMERAS 10 #define MAX_CAMERAS 10
@ -276,8 +277,12 @@ double CvCaptureCAM_PvAPI::getProperty( int property_id )
PvAttrUint32Get(Camera.Handle, "Height", &nTemp); PvAttrUint32Get(Camera.Handle, "Height", &nTemp);
return (double)nTemp; return (double)nTemp;
case CV_CAP_PROP_EXPOSURE: case CV_CAP_PROP_EXPOSURE:
PvAttrUint32Get(Camera.Handle,"ExposureValue",&nTemp); PvAttrUint32Get(Camera.Handle,"ExposureValue",&nTemp);
return (double)nTemp; return (double)nTemp;
case CV_CAP_PROP_FPS:
tPvFloat32 nfTemp;
PvAttrFloat32Get(Camera.Handle, "StatFrameRate", &nfTemp);
return (double)nfTemp;
} }
return -1.0; return -1.0;
} }
@ -321,13 +326,12 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
return false; return false;
} }
else { else {
string ip=cv::format("%d.%d.%d.%d", (value>>24)&255, (value>>16)&255, (value>>8)&255, value&255); std::string ip=cv::format("%d.%d.%d.%d", ((int)value>>24)&255, ((int)value>>16)&255, ((int)value>>8)&255, (int)value&255);
if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "On")==ePvErrSuccess) && if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "On")==ePvErrSuccess) &&
(PvAttrStringSet(priv->handle, "MulticastIPAddress", ip.c_str())==ePvErrSuccess)) { (PvAttrStringSet(Camera.Handle, "MulticastIPAddress", ip.c_str())==ePvErrSuccess))
break; break;
else else
return false; return false;
}
} }
default: default:
return false; return false;