Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename HTTPSink to MJPEGServer.

Browse Source
This commit is contained in:
Peter Johnson
2016-10-15 22:44:26 -07:00
parent d56c3f9adf
commit 30f4ecd171
10 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/lib/CameraServerJNI.cpp
View File

@@ -591,16 +591,15 @@ JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeSourcePro
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: createHTTPSink
* Method: createMJPEGServer
* Signature: (Ljava/lang/String;Ljava/lang/String;I)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_createHTTPSink
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_createMJPEGServer
(JNIEnv *env, jclass, jstring name, jstring listenAddress, jint port)
{
CS_Status status;
auto val =
cs::CreateHTTPSink(JStringRef{env, name},
JStringRef{env, listenAddress}, port, &status);
auto val = cs::CreateMJPEGServer(
JStringRef{env, name}, JStringRef{env, listenAddress}, port, &status);
CheckStatus(env, status);
return val;
}

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

@@ -130,7 +130,7 @@ public class CameraServerJNI {
//
// Sink Creation Functions
//
public static native int createHTTPSink(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));

8
java/src/edu/wpi/cameraserver/HTTPSink.java → java/src/edu/wpi/cameraserver/MJPEGServer.java
View File

@@ -8,19 +8,19 @@
package edu.wpi.cameraserver;
/// A sink that acts as a MJPEG-over-HTTP network server.
public class HTTPSink 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 HTTPSink(String name, String listenAddress, int port) {
super(CameraServerJNI.createHTTPSink(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 HTTPSink(String name, int port) {
public MJPEGServer(String name, int port) {
this(name, "", port);
}
}