Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for multiple channels.

Browse Source
This commit is contained in:
Peter Johnson
2016-09-18 14:14:35 -07:00
parent b78592d622
commit 9bb37d5df0
18 changed files with 36 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/edu/wpi/cameraserver/CameraServerJNI.java
View File

@@ -95,7 +95,7 @@ public class CameraServerJNI {
public static native int createUSBSourceDev(String name, int dev);
public static native int createUSBSourcePath(String name, String path);
public static native int createHTTPSource(String name, String url);
public static native int createCvSource(String name, int numChannels);
public static native int createCvSource(String name);
//
// Source Functions
@@ -103,7 +103,6 @@ public class CameraServerJNI {
public static native String getSourceName(int source);
public static native String getSourceDescription(int source);
public static native long getSourceLastFrameTime(int source);
public static native int getSourceNumChannels(int source);
public static native boolean isSourceConnected(int source);
public static native int getSourceProperty(int source, String name);
public static native int[] enumerateSourceProperties(int source);
@@ -113,8 +112,6 @@ public class CameraServerJNI {
//
// OpenCV Source Functions
//
//public static native void putSourceImage(int source, int channel, CvMat image);
public static native void notifySourceFrame(int source);
//public static native void putSourceFrame(int source, CvMat image);
public static native void notifySourceError(int source, String msg);
public static native void setSourceConnected(int source, boolean connected);
@@ -145,16 +142,9 @@ public class CameraServerJNI {
public static native int copySink(int sink);
public static native void releaseSink(int sink);
//
// Server Sink (e.g. HTTP) Functions
//
public static native void setSinkSourceChannel(int sink, int channel);
//
// OpenCV Sink Functions
//
public static native long sinkWaitForFrame(int sink);
//public static native int getSinkImage(int sink, CvMat image);
//public static native int grabSinkFrame(int sink, CvMat image);
public static native String getSinkError(int sink);
public static native void setSinkEnabled(int sink, boolean enabled);