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

Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)

Browse Source
This commit is contained in:
Peter Johnson
2016-12-04 00:08:47 -08:00
committed by GitHub
parent 7a587390ba
commit 1f93a4ab4f
22 changed files with 236 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
java/lib/CameraServerJNI.cpp
View File

@@ -60,7 +60,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
// Cache references to classes
jclass local;
local = env->FindClass("edu/wpi/cscore/USBCameraInfo");
local = env->FindClass("edu/wpi/cscore/UsbCameraInfo");
if (!local) return JNI_ERR;
usbCameraInfoCls = static_cast<jclass>(env->NewGlobalRef(local));
if (!usbCameraInfoCls) return JNI_ERR;
@@ -183,7 +183,7 @@ static inline bool CheckStatus(JNIEnv *env, CS_Status status) {
return status == CS_OK;
}
static jobject MakeJObject(JNIEnv *env, const cs::USBCameraInfo &info) {
static jobject MakeJObject(JNIEnv *env, const cs::UsbCameraInfo &info) {
static jmethodID constructor = env->GetMethodID(
usbCameraInfoCls, "<init>", "(ILjava/lang/String;Ljava/lang/String;)V");
JLocal<jstring> path(env, MakeJString(env, info.path));
@@ -382,28 +382,28 @@ JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_getEnumProper
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: createUSBCameraDev
* Method: createUsbCameraDev
* Signature: (Ljava/lang/String;I)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUSBCameraDev
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev
(JNIEnv *env, jclass, jstring name, jint dev)
{
CS_Status status = 0;
auto val = cs::CreateUSBCameraDev(JStringRef{env, name}, dev, &status);
auto val = cs::CreateUsbCameraDev(JStringRef{env, name}, dev, &status);
CheckStatus(env, status);
return val;
}
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: createUSBCameraPath
* Method: createUsbCameraPath
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUSBCameraPath
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath
(JNIEnv *env, jclass, jstring name, jstring path)
{
CS_Status status = 0;
auto val = cs::CreateUSBCameraPath(JStringRef{env, name},
auto val = cs::CreateUsbCameraPath(JStringRef{env, name},
JStringRef{env, path}, &status);
CheckStatus(env, status);
return val;
@@ -414,11 +414,11 @@ JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createUSBCameraPath
* Method: createHTTPCamera
* Signature: (Ljava/lang/String;Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHTTPCamera
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera
(JNIEnv *env, jclass, jstring name, jstring url)
{
CS_Status status = 0;
auto val = cs::CreateHTTPCamera(JStringRef{env, name},
auto val = cs::CreateHttpCamera(JStringRef{env, name},
JStringRef{env, url}, &status);
CheckStatus(env, status);
return val;
@@ -686,14 +686,14 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSource
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: getUSBCameraPath
* Method: getUsbCameraPath
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getUSBCameraPath
JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath
(JNIEnv *env, jclass, jint source)
{
CS_Status status = 0;
auto str = cs::GetUSBCameraPath(source, &status);
auto str = cs::GetUsbCameraPath(source, &status);
if (!CheckStatus(env, status)) return nullptr;
return MakeJString(env, str);
}
@@ -794,14 +794,14 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumProperty
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: createMJPEGServer
* Method: createMjpegServer
* Signature: (Ljava/lang/String;Ljava/lang/String;I)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createMJPEGServer
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer
(JNIEnv *env, jclass, jstring name, jstring listenAddress, jint port)
{
CS_Status status = 0;
auto val = cs::CreateMJPEGServer(
auto val = cs::CreateMjpegServer(
JStringRef{env, name}, JStringRef{env, listenAddress}, port, &status);
CheckStatus(env, status);
return val;
@@ -935,28 +935,28 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_releaseSink
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: getMJPEGServerListenAddress
* Method: getMjpegServerListenAddress
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMJPEGServerListenAddress
JNIEXPORT jstring JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerListenAddress
(JNIEnv *env, jclass, jint sink)
{
CS_Status status = 0;
auto str = cs::GetMJPEGServerListenAddress(sink, &status);
auto str = cs::GetMjpegServerListenAddress(sink, &status);
if (!CheckStatus(env, status)) return nullptr;
return MakeJString(env, str);
}
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: getMJPEGServerPort
* Method: getMjpegServerPort
* Signature: (I)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMJPEGServerPort
JNIEXPORT jint JNICALL Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort
(JNIEnv *env, jclass, jint sink)
{
CS_Status status = 0;
auto val = cs::GetMJPEGServerPort(sink, &status);
auto val = cs::GetMjpegServerPort(sink, &status);
CheckStatus(env, status);
return val;
}
@@ -1082,14 +1082,14 @@ JNIEXPORT void JNICALL Java_edu_wpi_cscore_CameraServerJNI_removeListener
/*
* Class: edu_wpi_cscore_CameraServerJNI
* Method: enumerateUSBCameras
* Signature: ()[Ledu/wpi/cameraserver/USBCameraInfo;
* Method: enumerateUsbCameras
* Signature: ()[Ledu/wpi/cameraserver/UsbCameraInfo;
*/
JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateUSBCameras
JNIEXPORT jobjectArray JNICALL Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbCameras
(JNIEnv *env, jclass)
{
CS_Status status = 0;
auto arr = cs::EnumerateUSBCameras(&status);
auto arr = cs::EnumerateUsbCameras(&status);
if (!CheckStatus(env, status)) return nullptr;
jobjectArray jarr =
env->NewObjectArray(arr.size(), usbCameraInfoCls, nullptr);

20
java/src/edu/wpi/cscore/CameraServerJNI.java
View File

@@ -102,9 +102,9 @@ public class CameraServerJNI {
//
// Source Creation Functions
//
public static native int createUSBCameraDev(String name, int dev);
public static native int createUSBCameraPath(String name, String path);
public static native int createHTTPCamera(String name, String url);
public static native int createUsbCameraDev(String name, int dev);
public static native int createUsbCameraPath(String name, String path);
public static native int createHttpCamera(String name, String url);
public static native int createCvSource(String name, int pixelFormat, int width, int height, int fps);
//
@@ -128,9 +128,9 @@ public class CameraServerJNI {
public static native void releaseSource(int source);
//
// USBCamera Source Functions
// UsbCamera Source Functions
//
public static native String getUSBCameraPath(int source);
public static native String getUsbCameraPath(int source);
//
// OpenCV Source Functions
@@ -145,7 +145,7 @@ public class CameraServerJNI {
//
// Sink Creation Functions
//
public static native int createMJPEGServer(String name, String listenAddress, int port);
public static native int createMjpegServer(String name, String listenAddress, int port);
public static native int createCvSink(String name);
//public static native int createCvSinkCallback(String name,
// void (*processFrame)(long time));
@@ -163,10 +163,10 @@ public class CameraServerJNI {
public static native void releaseSink(int sink);
//
// MJPEGServer Sink Functions
// MjpegServer Sink Functions
//
public static native String getMJPEGServerListenAddress(int sink);
public static native int getMJPEGServerPort(int sink);
public static native String getMjpegServerListenAddress(int sink);
public static native int getMjpegServerPort(int sink);
//
// OpenCV Sink Functions
@@ -187,7 +187,7 @@ public class CameraServerJNI {
//
// Utility Functions
//
public static native USBCameraInfo[] enumerateUSBCameras();
public static native UsbCameraInfo[] enumerateUsbCameras();
public static native int[] enumerateSources();

6
java/src/edu/wpi/cscore/HTTPCamera.java → java/src/edu/wpi/cscore/HttpCamera.java
View File

@@ -8,11 +8,11 @@
package edu.wpi.cscore;
/// A source that represents a MJPEG-over-HTTP (IP) camera.
public class HTTPCamera extends VideoSource {
public class HttpCamera extends VideoSource {
/// 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")
public HTTPCamera(String name, String url) {
super(CameraServerJNI.createHTTPCamera(name, url));
public HttpCamera(String name, String url) {
super(CameraServerJNI.createHttpCamera(name, url));
}
}

12
java/src/edu/wpi/cscore/MJPEGServer.java → java/src/edu/wpi/cscore/MjpegServer.java
View File

@@ -8,29 +8,29 @@
package edu.wpi.cscore;
/// A sink that acts as a MJPEG-over-HTTP network server.
public class MJPEGServer extends VideoSink {
public class MjpegServer extends VideoSink {
/// Create a MJPEG-over-HTTP server sink.
/// @param name Sink name (arbitrary unique identifier)
/// @param listenAddress TCP listen address (empty string for all addresses)
/// @param port TCP port number
public MJPEGServer(String name, String listenAddress, int port) {
super(CameraServerJNI.createMJPEGServer(name, listenAddress, port));
public MjpegServer(String name, String listenAddress, int port) {
super(CameraServerJNI.createMjpegServer(name, listenAddress, port));
}
/// Create a MJPEG-over-HTTP server sink.
/// @param name Sink name (arbitrary unique identifier)
/// @param port TCP port number
public MJPEGServer(String name, int port) {
public MjpegServer(String name, int port) {
this(name, "", port);
}
/// Get the listen address of the server.
public String getListenAddress() {
return CameraServerJNI.getMJPEGServerListenAddress(m_handle);
return CameraServerJNI.getMjpegServerListenAddress(m_handle);
}
/// Get the port number of the server.
public int getPort() {
return CameraServerJNI.getMJPEGServerPort(m_handle);
return CameraServerJNI.getMjpegServerPort(m_handle);
}
}

16
java/src/edu/wpi/cscore/USBCamera.java → java/src/edu/wpi/cscore/UsbCamera.java
View File

@@ -8,7 +8,7 @@
package edu.wpi.cscore;
/// A source that represents a USB camera.
public class USBCamera extends VideoSource {
public class UsbCamera extends VideoSource {
private static final String kPropWbAuto = "white_balance_temperature_auto";
private static final String kPropWbValue = "white_balance_temperature";
private static final String kPropExAuto = "exposure_auto";
@@ -33,26 +33,26 @@ public class USBCamera extends VideoSource {
/// Create a source for a USB camera based on device number.
/// @param name Source name (arbitrary unique identifier)
/// @param dev Device number (e.g. 0 for /dev/video0)
public USBCamera(String name, int dev) {
super(CameraServerJNI.createUSBCameraDev(name, dev));
public UsbCamera(String name, int dev) {
super(CameraServerJNI.createUsbCameraDev(name, dev));
}
/// Create a source for a USB camera based on device path.
/// @param name Source name (arbitrary unique identifier)
/// @param path Path to device (e.g. "/dev/video0" on Linux)
public USBCamera(String name, String path) {
super(CameraServerJNI.createUSBCameraPath(name, path));
public UsbCamera(String name, String path) {
super(CameraServerJNI.createUsbCameraPath(name, path));
}
/// Enumerate USB cameras on the local system.
/// @return Vector of USB camera information (one for each camera)
public static USBCameraInfo[] enumerateUSBCameras() {
return CameraServerJNI.enumerateUSBCameras();
public static UsbCameraInfo[] enumerateUsbCameras() {
return CameraServerJNI.enumerateUsbCameras();
}
/// Get the path to the device.
public String getPath() {
return CameraServerJNI.getUSBCameraPath(m_handle);
return CameraServerJNI.getUsbCameraPath(m_handle);
}
/// Set the brightness, as a percentage (0-100).

4
java/src/edu/wpi/cscore/USBCameraInfo.java → java/src/edu/wpi/cscore/UsbCameraInfo.java
View File

@@ -8,8 +8,8 @@
package edu.wpi.cscore;
/// USB camera information
public class USBCameraInfo {
public USBCameraInfo(int dev, String path, String name) {
public class UsbCameraInfo {
public UsbCameraInfo(int dev, String path, String name) {
this.dev = dev;
this.path = path;
this.name = name;

4
java/src/edu/wpi/cscore/VideoSink.java
View File

@@ -12,7 +12,7 @@ package edu.wpi.cscore;
/// are called channels.
public class VideoSink {
public enum Kind {
kUnknown(0), kMJPEG(2), kCv(4);
kUnknown(0), kMjpeg(2), kCv(4);
private int value;
private Kind(int value) {
@@ -26,7 +26,7 @@ public class VideoSink {
public static Kind getKindFromInt(int kind) {
switch (kind) {
case 2: return Kind.kMJPEG;
case 2: return Kind.kMjpeg;
case 4: return Kind.kCv;
default: return Kind.kUnknown;
}

6
java/src/edu/wpi/cscore/VideoSource.java
View File

@@ -12,7 +12,7 @@ package edu.wpi.cscore;
/// are called channels.
public class VideoSource {
public enum Kind {
kUnknown(0), kUSB(1), kHTTP(2), kCv(4);
kUnknown(0), kUsb(1), kHttp(2), kCv(4);
private int value;
private Kind(int value) {
@@ -26,8 +26,8 @@ public class VideoSource {
public static Kind getKindFromInt(int kind) {
switch (kind) {
case 1: return Kind.kUSB;
case 2: return Kind.kHTTP;
case 1: return Kind.kUsb;
case 2: return Kind.kHttp;
case 4: return Kind.kCv;
default: return Kind.kUnknown;
}