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

Create VideoCamera base class and move camera settings functions to it.

Browse Source 
This makes them available for both UsbCamera and HttpCamera / AxisCamera.

To avoid virtual functions in the public-facing interface, move the
implementation of the camera settings functions to the core library.
This commit is contained in:
Peter Johnson
2017-01-01 14:24:13 -08:00
parent 23135d7a5a
commit 7ddbf20108
19 changed files with 581 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/src/edu/wpi/cscore/HttpCamera.java
View File

@@ -8,12 +8,12 @@
package edu.wpi.cscore;
/// A source that represents a MJPEG-over-HTTP (IP) camera.
public class HttpCamera extends VideoSource {
public enum CameraKind {
public class HttpCamera extends VideoCamera {
public enum HttpCameraKind {
kUnknown(0), kMJPGStreamer(1), kCSCore(2), kAxis(3);
private int value;
private CameraKind(int value) {
private HttpCameraKind(int value) {
this.value = value;
}
@@ -22,12 +22,12 @@ public class HttpCamera extends VideoSource {
}
}
public static CameraKind getCameraKindFromInt(int kind) {
public static HttpCameraKind getHttpCameraKindFromInt(int kind) {
switch (kind) {
case 1: return CameraKind.kMJPGStreamer;
case 2: return CameraKind.kCSCore;
case 3: return CameraKind.kAxis;
default: return CameraKind.kUnknown;
case 1: return HttpCameraKind.kMJPGStreamer;
case 2: return HttpCameraKind.kCSCore;
case 3: return HttpCameraKind.kAxis;
default: return HttpCameraKind.kUnknown;
}
}
@@ -35,14 +35,14 @@ public class HttpCamera extends VideoSource {
/// @param name Source name (arbitrary unique identifier)
/// @param url Camera URL (e.g. "http://10.x.y.11/video/stream.mjpg")
public HttpCamera(String name, String url) {
super(CameraServerJNI.createHttpCamera(name, url, CameraKind.kUnknown.getValue()));
super(CameraServerJNI.createHttpCamera(name, url, HttpCameraKind.kUnknown.getValue()));
}
/// Create a source for a MJPEG-over-HTTP (IP) camera.
/// @param name Source name (arbitrary unique identifier)
/// @param url Camera URL (e.g. "http://10.x.y.11/video/stream.mjpg")
/// @param kind Camera kind (e.g. kAxis)
public HttpCamera(String name, String url, CameraKind kind) {
public HttpCamera(String name, String url, HttpCameraKind kind) {
super(CameraServerJNI.createHttpCamera(name, url, kind.getValue()));
}
@@ -50,22 +50,22 @@ public class HttpCamera extends VideoSource {
/// @param name Source name (arbitrary unique identifier)
/// @param urls Array of Camera URLs
public HttpCamera(String name, String[] urls) {
super(CameraServerJNI.createHttpCameraMulti(name, urls, CameraKind.kUnknown.getValue()));
super(CameraServerJNI.createHttpCameraMulti(name, urls, HttpCameraKind.kUnknown.getValue()));
}
/// Create a source for a MJPEG-over-HTTP (IP) camera.
/// @param name Source name (arbitrary unique identifier)
/// @param urls Array of Camera URLs
/// @param kind Camera kind (e.g. kAxis)
public HttpCamera(String name, String[] urls, CameraKind kind) {
public HttpCamera(String name, String[] urls, HttpCameraKind kind) {
super(CameraServerJNI.createHttpCameraMulti(name, urls, kind.getValue()));
}
/// Get the kind of HTTP camera.
/// Autodetection can result in returning a different value than the camera
/// was created with.
public CameraKind getCameraKind() {
return getCameraKindFromInt(CameraServerJNI.getHttpCameraKind(m_handle));
public HttpCameraKind getHttpCameraKind() {
return getHttpCameraKindFromInt(CameraServerJNI.getHttpCameraKind(m_handle));
}
/// Change the URLs used to connect to the camera.