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

Rename from cameraserver to cscore.

Browse Source 
This is primarily to avoid header naming conflicts with wpilib.
This commit is contained in:
Peter Johnson
2016-11-05 22:11:55 -07:00
parent 891ce06312
commit f83ff41e47
50 changed files with 164 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
java/java.gradle
View File

@@ -27,8 +27,8 @@ dependencies {
}
jar {
description = 'Generates CameraServer jar, with the JNI shared libraries embedded'
baseName = 'cameraserver'
description = 'Generates cscore jar, with the JNI shared libraries embedded'
baseName = 'cscore'
classifier = "$buildPlatform"
duplicatesStrategy = 'exclude'
@@ -48,41 +48,41 @@ jar {
project.tasks.whenTaskAdded { task ->
if (isArm) {
if (task.name == 'cameraserverSharedLibrary') jar.dependsOn task
if (task.name == 'cscoreSharedLibrary') jar.dependsOn task
} else {
if (task.name == 'cameraserverX64SharedLibrary' || task.name == 'cameraserverX86SharedLibrary')
if (task.name == 'cscoreX64SharedLibrary' || task.name == 'cscoreX86SharedLibrary')
jar.dependsOn task
}
}
task cameraserverJavaSource(type: Jar, dependsOn: classes) {
description = 'Generates the source jar for CameraServer java'
task cscoreJavaSource(type: Jar, dependsOn: classes) {
description = 'Generates the source jar for cscore java'
group = 'WPILib'
baseName = 'cameraserver'
baseName = 'cscore'
classifier = "sources"
duplicatesStrategy = 'exclude'
from sourceSets.main.allJava
}
task cameraserverJavadoc(type: Jar, dependsOn: javadoc) {
description = 'Generates the javadoc jar for CameraServer java'
task cscoreJavadoc(type: Jar, dependsOn: javadoc) {
description = 'Generates the javadoc jar for cscore java'
group = 'WPILib'
baseName = 'cameraserver'
baseName = 'cscore'
classifier = "javadoc"
duplicatesStrategy = 'exclude'
from javadoc.destinationDir
}
build.dependsOn cameraserverJavaSource
build.dependsOn cameraserverJavadoc
build.dependsOn cscoreJavaSource
build.dependsOn cscoreJavadoc
/**
* Generates the JNI headers
*/
task jniHeadersCameraServer {
description = 'Generates JNI headers from edu.wpi.cameraserver.*'
task jniHeadersCscore {
description = 'Generates JNI headers from edu.wpi.cscore.*'
group = 'WPILib'
def outputFolder = file(generatedJNIHeaderLoc)
inputs.files sourceSets.main.output
@@ -93,7 +93,7 @@ task jniHeadersCameraServer {
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
args '-d', outputFolder
args '-classpath', sourceSets.main.runtimeClasspath.asPath
args 'edu.wpi.cameraserver.CameraServerJNI'
args 'edu.wpi.cscore.CameraServerJNI'
}
}
}
@@ -145,7 +145,7 @@ ext.setupJniIncludes = { binaries ->
}
}
jniHeadersCameraServer.outputs.files.each { file ->
jniHeadersCscore.outputs.files.each { file ->
if (buildPlatform == 'arm') {
cppCompiler.args '-I', file.getPath()
} else {
@@ -153,7 +153,7 @@ ext.setupJniIncludes = { binaries ->
}
}
dependsOn jniHeadersCameraServer
dependsOn jniHeadersCscore
}
}
}

4
java/lib/CameraServerJNI.cpp
View File

@@ -5,12 +5,12 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "edu_wpi_cameraserver_CameraServerJNI.h"
#include "edu_wpi_cscore_CameraServerJNI.h"
#include "llvm/SmallString.h"
#include "support/jni_util.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
using namespace wpi::java;

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

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
import java.io.File;
import java.io.InputStream;

2
java/src/edu/wpi/cameraserver/CvSink.java → java/src/edu/wpi/cscore/CvSink.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
import org.opencv.core.Mat;

2
java/src/edu/wpi/cameraserver/CvSource.java → java/src/edu/wpi/cscore/CvSource.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
import org.opencv.core.Mat;

2
java/src/edu/wpi/cameraserver/HTTPCamera.java → java/src/edu/wpi/cscore/HTTPCamera.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// A source that represents a MJPEG-over-HTTP (IP) camera.
public class HTTPCamera extends VideoSource {

2
java/src/edu/wpi/cameraserver/MJPEGServer.java → java/src/edu/wpi/cscore/MJPEGServer.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// A sink that acts as a MJPEG-over-HTTP network server.
public class MJPEGServer extends VideoSink {

2
java/src/edu/wpi/cameraserver/USBCamera.java → java/src/edu/wpi/cscore/USBCamera.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// A source that represents a USB camera.
public class USBCamera extends VideoSource {

2
java/src/edu/wpi/cameraserver/USBCameraInfo.java → java/src/edu/wpi/cscore/USBCameraInfo.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// USB camera information
public class USBCameraInfo {

2
java/src/edu/wpi/cameraserver/VideoEvent.java → java/src/edu/wpi/cscore/VideoEvent.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// Video event
public class VideoEvent {

2
java/src/edu/wpi/cameraserver/VideoListener.java → java/src/edu/wpi/cscore/VideoListener.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// An event listener. This calls back to a desigated callback function when
/// an event matching the specified mask is generated by the library.

2
java/src/edu/wpi/cameraserver/VideoListenerFunction.java → java/src/edu/wpi/cscore/VideoListenerFunction.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
public interface VideoListenerFunction {
void apply(VideoEvent event);

2
java/src/edu/wpi/cameraserver/VideoMode.java → java/src/edu/wpi/cscore/VideoMode.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// Video mode
public class VideoMode {

2
java/src/edu/wpi/cameraserver/VideoProperty.java → java/src/edu/wpi/cscore/VideoProperty.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
public class VideoProperty {
public enum Type {

2
java/src/edu/wpi/cameraserver/VideoSink.java → java/src/edu/wpi/cscore/VideoSink.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// A source for video that provides a sequence of frames. Each frame may
/// consist of multiple images (e.g. from a stereo or depth camera); these

2
java/src/edu/wpi/cameraserver/VideoSource.java → java/src/edu/wpi/cscore/VideoSource.java
View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package edu.wpi.cameraserver;
package edu.wpi.cscore;
/// A source for video that provides a sequence of frames. Each frame may
/// consist of multiple images (e.g. from a stereo or depth camera); these