Update for wpi::Now() change to microseconds. (#113)

Also be explicit in docs about what timebase and step are used.
This commit is contained in:
Peter Johnson
2017-11-19 14:35:50 -08:00
committed by GitHub
parent e9b0b9d8f6
commit 7847c69231
4 changed files with 10 additions and 5 deletions

View File

@@ -60,7 +60,7 @@ public class CvSink extends VideoSink {
* Times out (returning 0) after timeout seconds.
* The provided image will have three 3-bit channels stored in BGR order.
* @return Frame time, or 0 on error (call GetError() to obtain the error
* message)
* message); the frame time is in 1 us increments.
*/
public long grabFrame(Mat image, double timeout) {
return CameraServerJNI.grabSinkFrameTimeout(m_handle, image.nativeObj, timeout);
@@ -70,7 +70,7 @@ public class CvSink extends VideoSink {
* Wait for the next frame and get the image. May block forever.
* The provided image will have three 3-bit channels stored in BGR order.
* @return Frame time, or 0 on error (call GetError() to obtain the error
* message)
* message); the frame time is in 1 us increments.
*/
public long grabFrameNoTimeout(Mat image) {
return CameraServerJNI.grabSinkFrame(m_handle, image.nativeObj);

View File

@@ -90,6 +90,7 @@ public class VideoSource {
/**
* Get the last time a frame was captured.
* @return Time in 1 us increments.
*/
public long getLastFrameTime() {
return CameraServerJNI.getSourceLastFrameTime(m_handle);