diff --git a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java index 3366b39979..f488487c55 100644 --- a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java +++ b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java @@ -10,8 +10,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import edu.wpi.cscore.VideoSource; import edu.wpi.first.cameraserver.CameraServer; +import edu.wpi.first.cscore.VideoSource; import edu.wpi.first.networktables.NetworkTableInstance; import java.io.IOException; import java.nio.file.Files; diff --git a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java index 6867d5f9ec..b994749577 100644 --- a/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java +++ b/cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java @@ -4,20 +4,20 @@ package edu.wpi.first.cameraserver; -import edu.wpi.cscore.AxisCamera; -import edu.wpi.cscore.CameraServerJNI; -import edu.wpi.cscore.CvSink; -import edu.wpi.cscore.CvSource; -import edu.wpi.cscore.MjpegServer; -import edu.wpi.cscore.UsbCamera; -import edu.wpi.cscore.VideoEvent; -import edu.wpi.cscore.VideoException; -import edu.wpi.cscore.VideoListener; -import edu.wpi.cscore.VideoMode; -import edu.wpi.cscore.VideoMode.PixelFormat; -import edu.wpi.cscore.VideoProperty; -import edu.wpi.cscore.VideoSink; -import edu.wpi.cscore.VideoSource; +import edu.wpi.first.cscore.AxisCamera; +import edu.wpi.first.cscore.CameraServerJNI; +import edu.wpi.first.cscore.CvSink; +import edu.wpi.first.cscore.CvSource; +import edu.wpi.first.cscore.MjpegServer; +import edu.wpi.first.cscore.UsbCamera; +import edu.wpi.first.cscore.VideoEvent; +import edu.wpi.first.cscore.VideoException; +import edu.wpi.first.cscore.VideoListener; +import edu.wpi.first.cscore.VideoMode; +import edu.wpi.first.cscore.VideoMode.PixelFormat; +import edu.wpi.first.cscore.VideoProperty; +import edu.wpi.first.cscore.VideoSink; +import edu.wpi.first.cscore.VideoSource; import edu.wpi.first.networktables.EntryListenerFlags; import edu.wpi.first.networktables.NetworkTable; import edu.wpi.first.networktables.NetworkTableEntry; diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java b/cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java index 2a1275791c..ab7072f6c9 100644 --- a/cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java +++ b/cameraserver/src/main/java/edu/wpi/first/vision/VisionRunner.java @@ -4,9 +4,9 @@ package edu.wpi.first.vision; -import edu.wpi.cscore.CvSink; -import edu.wpi.cscore.VideoSource; import edu.wpi.first.cameraserver.CameraServerSharedStore; +import edu.wpi.first.cscore.CvSink; +import edu.wpi.first.cscore.VideoSource; import org.opencv.core.Mat; /** diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java b/cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java index 5ce896dbf9..6f1a1e35b5 100644 --- a/cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java +++ b/cameraserver/src/main/java/edu/wpi/first/vision/VisionThread.java @@ -4,7 +4,7 @@ package edu.wpi.first.vision; -import edu.wpi.cscore.VideoSource; +import edu.wpi.first.cscore.VideoSource; /** * A vision thread is a special thread that runs a vision pipeline. It is a daemon thread; it diff --git a/cameraserver/src/main/java/edu/wpi/first/vision/package-info.java b/cameraserver/src/main/java/edu/wpi/first/vision/package-info.java index 758ea2889d..b7bab9c35c 100644 --- a/cameraserver/src/main/java/edu/wpi/first/vision/package-info.java +++ b/cameraserver/src/main/java/edu/wpi/first/vision/package-info.java @@ -13,7 +13,7 @@ * implements VisionRunner.Listener<MyFindTotePipeline> { * * // A USB camera connected to the roboRIO. - * private {@link edu.wpi.cscore.VideoSource VideoSource} usbCamera; + * private {@link edu.wpi.first.cscore.VideoSource VideoSource} usbCamera; * * // A vision pipeline. This could be handwritten or generated by GRIP. * // This has to implement {@link edu.wpi.first.vision.VisionPipeline}. diff --git a/cscore/src/dev/java/edu/wpi/cscore/DevMain.java b/cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java similarity index 94% rename from cscore/src/dev/java/edu/wpi/cscore/DevMain.java rename to cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java index 69198cb247..5ccbed722b 100644 --- a/cscore/src/dev/java/edu/wpi/cscore/DevMain.java +++ b/cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import edu.wpi.first.wpiutil.RuntimeDetector; diff --git a/cscore/src/main/java/edu/wpi/cscore/AxisCamera.java b/cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java similarity index 97% rename from cscore/src/main/java/edu/wpi/cscore/AxisCamera.java rename to cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java index c219517ee5..296bd6bd14 100644 --- a/cscore/src/main/java/edu/wpi/cscore/AxisCamera.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A source that represents an Axis IP camera. */ public class AxisCamera extends HttpCamera { diff --git a/cscore/src/main/java/edu/wpi/cscore/CameraServerCvJNI.java b/cscore/src/main/java/edu/wpi/first/cscore/CameraServerCvJNI.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/CameraServerCvJNI.java rename to cscore/src/main/java/edu/wpi/first/cscore/CameraServerCvJNI.java index 34fcfc22c5..6d382c87db 100644 --- a/cscore/src/main/java/edu/wpi/cscore/CameraServerCvJNI.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/CameraServerCvJNI.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import edu.wpi.first.wpiutil.RuntimeLoader; import java.io.IOException; diff --git a/cscore/src/main/java/edu/wpi/cscore/CameraServerJNI.java b/cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/CameraServerJNI.java rename to cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java index 2672a90ecd..b7a9216e82 100644 --- a/cscore/src/main/java/edu/wpi/cscore/CameraServerJNI.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; -import edu.wpi.cscore.raw.RawFrame; +import edu.wpi.first.cscore.raw.RawFrame; import edu.wpi.first.wpiutil.RuntimeLoader; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/cscore/src/main/java/edu/wpi/cscore/CvSink.java b/cscore/src/main/java/edu/wpi/first/cscore/CvSink.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/CvSink.java rename to cscore/src/main/java/edu/wpi/first/cscore/CvSink.java index 5e3489ca12..28f0dd13a8 100644 --- a/cscore/src/main/java/edu/wpi/cscore/CvSink.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/CvSink.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import org.opencv.core.Mat; diff --git a/cscore/src/main/java/edu/wpi/cscore/CvSource.java b/cscore/src/main/java/edu/wpi/first/cscore/CvSource.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/CvSource.java rename to cscore/src/main/java/edu/wpi/first/cscore/CvSource.java index 09f551b7c6..3934a09c0b 100644 --- a/cscore/src/main/java/edu/wpi/cscore/CvSource.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/CvSource.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import org.opencv.core.Mat; diff --git a/cscore/src/main/java/edu/wpi/cscore/HttpCamera.java b/cscore/src/main/java/edu/wpi/first/cscore/HttpCamera.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/HttpCamera.java rename to cscore/src/main/java/edu/wpi/first/cscore/HttpCamera.java index 1caeb338ac..9758f90436 100644 --- a/cscore/src/main/java/edu/wpi/cscore/HttpCamera.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/HttpCamera.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A source that represents a MJPEG-over-HTTP (IP) camera. */ public class HttpCamera extends VideoCamera { diff --git a/cscore/src/main/java/edu/wpi/cscore/ImageSink.java b/cscore/src/main/java/edu/wpi/first/cscore/ImageSink.java similarity index 97% rename from cscore/src/main/java/edu/wpi/cscore/ImageSink.java rename to cscore/src/main/java/edu/wpi/first/cscore/ImageSink.java index 8907ee1106..55318da1cb 100644 --- a/cscore/src/main/java/edu/wpi/cscore/ImageSink.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/ImageSink.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; public abstract class ImageSink extends VideoSink { protected ImageSink(int handle) { diff --git a/cscore/src/main/java/edu/wpi/cscore/ImageSource.java b/cscore/src/main/java/edu/wpi/first/cscore/ImageSource.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/ImageSource.java rename to cscore/src/main/java/edu/wpi/first/cscore/ImageSource.java index 93f994c250..431e75cfa4 100644 --- a/cscore/src/main/java/edu/wpi/cscore/ImageSource.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/ImageSource.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; public abstract class ImageSource extends VideoSource { protected ImageSource(int handle) { diff --git a/cscore/src/main/java/edu/wpi/cscore/MjpegServer.java b/cscore/src/main/java/edu/wpi/first/cscore/MjpegServer.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/MjpegServer.java rename to cscore/src/main/java/edu/wpi/first/cscore/MjpegServer.java index 29619d27d3..a1ffb6331d 100644 --- a/cscore/src/main/java/edu/wpi/cscore/MjpegServer.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/MjpegServer.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A sink that acts as a MJPEG-over-HTTP network server. */ public class MjpegServer extends VideoSink { diff --git a/cscore/src/main/java/edu/wpi/cscore/UsbCamera.java b/cscore/src/main/java/edu/wpi/first/cscore/UsbCamera.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/UsbCamera.java rename to cscore/src/main/java/edu/wpi/first/cscore/UsbCamera.java index 144a4aadb5..2b5cf5a41a 100644 --- a/cscore/src/main/java/edu/wpi/cscore/UsbCamera.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/UsbCamera.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A source that represents a USB camera. */ public class UsbCamera extends VideoCamera { diff --git a/cscore/src/main/java/edu/wpi/cscore/UsbCameraInfo.java b/cscore/src/main/java/edu/wpi/first/cscore/UsbCameraInfo.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/UsbCameraInfo.java rename to cscore/src/main/java/edu/wpi/first/cscore/UsbCameraInfo.java index 4899c77828..df856e8d2d 100644 --- a/cscore/src/main/java/edu/wpi/cscore/UsbCameraInfo.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/UsbCameraInfo.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** USB camera information. */ public class UsbCameraInfo { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoCamera.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoCamera.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/VideoCamera.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoCamera.java index 2a93112a9c..ca3b09e642 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoCamera.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoCamera.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A source that represents a video camera. */ public class VideoCamera extends VideoSource { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoEvent.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoEvent.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/VideoEvent.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoEvent.java index c2731fdc78..ca38109b47 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoEvent.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoEvent.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** Video event. */ public class VideoEvent { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoException.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoException.java similarity index 94% rename from cscore/src/main/java/edu/wpi/cscore/VideoException.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoException.java index 1142c0f8d7..1c445c6f77 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoException.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoException.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** An exception raised by the camera server. */ public class VideoException extends RuntimeException { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoListener.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoListener.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/VideoListener.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoListener.java index cfaeb9da2a..0d77461432 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoListener.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoListener.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import java.util.HashMap; import java.util.Map; diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoMode.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoMode.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/VideoMode.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoMode.java index b7191eeb40..af7fb8f1cb 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoMode.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoMode.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** Video mode. */ public class VideoMode { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoProperty.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoProperty.java similarity index 98% rename from cscore/src/main/java/edu/wpi/cscore/VideoProperty.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoProperty.java index 53a24ad7fa..8179ba3c3d 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoProperty.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoProperty.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** A source or sink property. */ public class VideoProperty { diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoSink.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoSink.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/VideoSink.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoSink.java index 098f9cb4bf..ea65d0e54a 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoSink.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoSink.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** * A source for video that provides a sequence of frames. Each frame may consist of multiple images diff --git a/cscore/src/main/java/edu/wpi/cscore/VideoSource.java b/cscore/src/main/java/edu/wpi/first/cscore/VideoSource.java similarity index 99% rename from cscore/src/main/java/edu/wpi/cscore/VideoSource.java rename to cscore/src/main/java/edu/wpi/first/cscore/VideoSource.java index fc115c7924..047503a1e3 100644 --- a/cscore/src/main/java/edu/wpi/cscore/VideoSource.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/VideoSource.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; /** * A source for video that provides a sequence of frames. Each frame may consist of multiple images diff --git a/cscore/src/main/java/edu/wpi/cscore/raw/RawFrame.java b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawFrame.java similarity index 97% rename from cscore/src/main/java/edu/wpi/cscore/raw/RawFrame.java rename to cscore/src/main/java/edu/wpi/first/cscore/raw/RawFrame.java index 18da73dc3a..1919d6b2dd 100644 --- a/cscore/src/main/java/edu/wpi/cscore/raw/RawFrame.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawFrame.java @@ -2,9 +2,9 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore.raw; +package edu.wpi.first.cscore.raw; -import edu.wpi.cscore.CameraServerJNI; +import edu.wpi.first.cscore.CameraServerJNI; import java.nio.ByteBuffer; /** diff --git a/cscore/src/main/java/edu/wpi/cscore/raw/RawSink.java b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSink.java similarity index 94% rename from cscore/src/main/java/edu/wpi/cscore/raw/RawSink.java rename to cscore/src/main/java/edu/wpi/first/cscore/raw/RawSink.java index e9854136b7..64afae2b64 100644 --- a/cscore/src/main/java/edu/wpi/cscore/raw/RawSink.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSink.java @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore.raw; +package edu.wpi.first.cscore.raw; -import edu.wpi.cscore.CameraServerJNI; -import edu.wpi.cscore.ImageSink; +import edu.wpi.first.cscore.CameraServerJNI; +import edu.wpi.first.cscore.ImageSink; /** * A sink for user code to accept video frames as raw bytes. diff --git a/cscore/src/main/java/edu/wpi/cscore/raw/RawSource.java b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSource.java similarity index 93% rename from cscore/src/main/java/edu/wpi/cscore/raw/RawSource.java rename to cscore/src/main/java/edu/wpi/first/cscore/raw/RawSource.java index 89cb257670..f1be05065b 100644 --- a/cscore/src/main/java/edu/wpi/cscore/raw/RawSource.java +++ b/cscore/src/main/java/edu/wpi/first/cscore/raw/RawSource.java @@ -2,11 +2,11 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore.raw; +package edu.wpi.first.cscore.raw; -import edu.wpi.cscore.CameraServerJNI; -import edu.wpi.cscore.ImageSource; -import edu.wpi.cscore.VideoMode; +import edu.wpi.first.cscore.CameraServerJNI; +import edu.wpi.first.cscore.ImageSource; +import edu.wpi.first.cscore.VideoMode; /** * A source for user code to provide video frames as raw bytes. diff --git a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp index 62ab2b29da..a603fbf820 100644 --- a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp +++ b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp @@ -12,7 +12,7 @@ #include "cscore_cpp.h" #include "cscore_cv.h" #include "cscore_raw.h" -#include "edu_wpi_cscore_CameraServerJNI.h" +#include "edu_wpi_first_cscore_CameraServerJNI.h" namespace cv { class Mat; @@ -39,13 +39,13 @@ static JException exceptionEx; static JNIEnv* listenerEnv = nullptr; static const JClassInit classes[] = { - {"edu/wpi/cscore/UsbCameraInfo", &usbCameraInfoCls}, - {"edu/wpi/cscore/VideoMode", &videoModeCls}, - {"edu/wpi/cscore/VideoEvent", &videoEventCls}, - {"edu/wpi/cscore/raw/RawFrame", &rawFrameCls}}; + {"edu/wpi/first/cscore/UsbCameraInfo", &usbCameraInfoCls}, + {"edu/wpi/first/cscore/VideoMode", &videoModeCls}, + {"edu/wpi/first/cscore/VideoEvent", &videoEventCls}, + {"edu/wpi/first/cscore/raw/RawFrame", &rawFrameCls}}; static const JExceptionInit exceptions[] = { - {"edu/wpi/cscore/VideoException", &videoEx}, + {"edu/wpi/first/cscore/VideoException", &videoEx}, {"java/lang/InterruptedException", &interruptedEx}, {"java/lang/NullPointerException", &nullPointerEx}, {"java/lang/UnsupportedOperationException", &unsupportedEx}, @@ -308,12 +308,12 @@ static jobjectArray MakeJObject(JNIEnv* env, wpi::ArrayRef arr) { extern "C" { /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyKind +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyKind (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -323,12 +323,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyKind } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyName +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyName (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -341,12 +341,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyName } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getProperty * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getProperty +Java_edu_wpi_first_cscore_CameraServerJNI_getProperty (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -356,12 +356,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setProperty * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setProperty +Java_edu_wpi_first_cscore_CameraServerJNI_setProperty (JNIEnv* env, jclass, jint property, jint value) { CS_Status status = 0; @@ -370,12 +370,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyMin * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyMin +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMin (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -385,12 +385,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyMin } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyMax * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyMax +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyMax (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -400,12 +400,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyMax } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyStep * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyStep +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyStep (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -415,12 +415,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyStep } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getPropertyDefault * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getPropertyDefault +Java_edu_wpi_first_cscore_CameraServerJNI_getPropertyDefault (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -430,12 +430,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getPropertyDefault } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getStringProperty * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getStringProperty +Java_edu_wpi_first_cscore_CameraServerJNI_getStringProperty (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -448,12 +448,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getStringProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setStringProperty * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setStringProperty +Java_edu_wpi_first_cscore_CameraServerJNI_setStringProperty (JNIEnv* env, jclass, jint property, jstring value) { if (!value) { @@ -466,12 +466,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setStringProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getEnumPropertyChoices * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getEnumPropertyChoices +Java_edu_wpi_first_cscore_CameraServerJNI_getEnumPropertyChoices (JNIEnv* env, jclass, jint property) { CS_Status status = 0; @@ -483,12 +483,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getEnumPropertyChoices } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createUsbCameraDev * Signature: (Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev +Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraDev (JNIEnv* env, jclass, jstring name, jint dev) { if (!name) { @@ -502,12 +502,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraDev } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createUsbCameraPath * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath +Java_edu_wpi_first_cscore_CameraServerJNI_createUsbCameraPath (JNIEnv* env, jclass, jstring name, jstring path) { if (!name) { @@ -526,12 +526,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createUsbCameraPath } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createHttpCamera * Signature: (Ljava/lang/String;Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera +Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCamera (JNIEnv* env, jclass, jstring name, jstring url, jint kind) { if (!name) { @@ -551,12 +551,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createHttpCamera } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createHttpCameraMulti * Signature: (Ljava/lang/String;[Ljava/lang/Object;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createHttpCameraMulti +Java_edu_wpi_first_cscore_CameraServerJNI_createHttpCameraMulti (JNIEnv* env, jclass, jstring name, jobjectArray urls, jint kind) { if (!name) { @@ -588,12 +588,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createHttpCameraMulti } /* - * Class: edu_wpi_cscore_CameraServerCvJNI + * Class: edu_wpi_first_cscore_CameraServerCvJNI * Method: createCvSource * Signature: (Ljava/lang/String;IIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerCvJNI_createCvSource +Java_edu_wpi_first_cscore_CameraServerCvJNI_createCvSource (JNIEnv* env, jclass, jstring name, jint pixelFormat, jint width, jint height, jint fps) { @@ -613,12 +613,12 @@ Java_edu_wpi_cscore_CameraServerCvJNI_createCvSource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createRawSource * Signature: (Ljava/lang/String;IIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createRawSource +Java_edu_wpi_first_cscore_CameraServerJNI_createRawSource (JNIEnv* env, jclass, jstring name, jint pixelFormat, jint width, jint height, jint fps) { @@ -638,12 +638,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createRawSource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceKind +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceKind (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -653,12 +653,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceKind } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceName +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceName (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -671,12 +671,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceName } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceDescription * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceDescription +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceDescription (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -689,12 +689,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceDescription } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceLastFrameTime * Signature: (I)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceLastFrameTime +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceLastFrameTime (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -704,12 +704,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceLastFrameTime } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceConnectionStrategy * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceConnectionStrategy +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnectionStrategy (JNIEnv* env, jclass, jint source, jint strategy) { CS_Status status = 0; @@ -719,12 +719,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceConnectionStrategy } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: isSourceConnected * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_isSourceConnected +Java_edu_wpi_first_cscore_CameraServerJNI_isSourceConnected (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -734,12 +734,12 @@ Java_edu_wpi_cscore_CameraServerJNI_isSourceConnected } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: isSourceEnabled * Signature: (I)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_isSourceEnabled +Java_edu_wpi_first_cscore_CameraServerJNI_isSourceEnabled (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -749,12 +749,12 @@ Java_edu_wpi_cscore_CameraServerJNI_isSourceEnabled } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceProperty +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceProperty (JNIEnv* env, jclass, jint source, jstring name) { if (!name) { @@ -769,12 +769,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSourceProperties * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceProperties +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceProperties (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -787,12 +787,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceProperties } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceVideoMode * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceVideoMode +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceVideoMode (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -804,12 +804,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceVideoMode } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceVideoMode * Signature: (IIIII)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceVideoMode +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceVideoMode (JNIEnv* env, jclass, jint source, jint pixelFormat, jint width, jint height, jint fps) { @@ -824,12 +824,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceVideoMode } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourcePixelFormat * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourcePixelFormat +Java_edu_wpi_first_cscore_CameraServerJNI_setSourcePixelFormat (JNIEnv* env, jclass, jint source, jint pixelFormat) { CS_Status status = 0; @@ -840,12 +840,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourcePixelFormat } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceResolution * Signature: (III)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceResolution +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceResolution (JNIEnv* env, jclass, jint source, jint width, jint height) { CS_Status status = 0; @@ -855,12 +855,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceResolution } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceFPS * Signature: (II)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceFPS +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceFPS (JNIEnv* env, jclass, jint source, jint fps) { CS_Status status = 0; @@ -870,12 +870,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceFPS } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceConfigJson * Signature: (ILjava/lang/String;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceConfigJson +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConfigJson (JNIEnv* env, jclass, jint source, jstring config) { CS_Status status = 0; @@ -885,12 +885,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceConfigJson } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSourceConfigJson * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSourceConfigJson +Java_edu_wpi_first_cscore_CameraServerJNI_getSourceConfigJson (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -900,12 +900,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSourceConfigJson } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSourceVideoModes * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceVideoModes +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceVideoModes (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -925,12 +925,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceVideoModes } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSourceSinks * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceSinks +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSourceSinks (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -943,12 +943,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSourceSinks } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: copySource * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_copySource +Java_edu_wpi_first_cscore_CameraServerJNI_copySource (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -958,12 +958,12 @@ Java_edu_wpi_cscore_CameraServerJNI_copySource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: releaseSource * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_releaseSource +Java_edu_wpi_first_cscore_CameraServerJNI_releaseSource (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -972,12 +972,12 @@ Java_edu_wpi_cscore_CameraServerJNI_releaseSource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraBrightness * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraBrightness +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraBrightness (JNIEnv* env, jclass, jint source, jint brightness) { CS_Status status = 0; @@ -986,12 +986,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraBrightness } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getCameraBrightness * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getCameraBrightness +Java_edu_wpi_first_cscore_CameraServerJNI_getCameraBrightness (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1001,12 +1001,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getCameraBrightness } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraWhiteBalanceAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceAuto +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceAuto (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1015,12 +1015,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceAuto } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraWhiteBalanceHoldCurrent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1029,12 +1029,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceHoldCurrent } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraWhiteBalanceManual * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceManual +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraWhiteBalanceManual (JNIEnv* env, jclass, jint source, jint value) { CS_Status status = 0; @@ -1043,12 +1043,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraWhiteBalanceManual } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraExposureAuto * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureAuto +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureAuto (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1057,12 +1057,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureAuto } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraExposureHoldCurrent * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureHoldCurrent +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureHoldCurrent (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1071,12 +1071,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureHoldCurrent } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setCameraExposureManual * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureManual +Java_edu_wpi_first_cscore_CameraServerJNI_setCameraExposureManual (JNIEnv* env, jclass, jint source, jint value) { CS_Status status = 0; @@ -1085,12 +1085,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setCameraExposureManual } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setUsbCameraPath * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setUsbCameraPath +Java_edu_wpi_first_cscore_CameraServerJNI_setUsbCameraPath (JNIEnv* env, jclass, jint source, jstring path) { CS_Status status = 0; @@ -1099,12 +1099,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setUsbCameraPath } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getUsbCameraPath * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath +Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraPath (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1116,12 +1116,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraPath } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getUsbCameraInfo * Signature: (I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraInfo +Java_edu_wpi_first_cscore_CameraServerJNI_getUsbCameraInfo (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1133,12 +1133,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getUsbCameraInfo } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getHttpCameraKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraKind +Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraKind (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1150,12 +1150,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraKind } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setHttpCameraUrls * Signature: (I[Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setHttpCameraUrls +Java_edu_wpi_first_cscore_CameraServerJNI_setHttpCameraUrls (JNIEnv* env, jclass, jint source, jobjectArray urls) { if (!urls) { @@ -1180,12 +1180,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setHttpCameraUrls } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getHttpCameraUrls * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraUrls +Java_edu_wpi_first_cscore_CameraServerJNI_getHttpCameraUrls (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1197,12 +1197,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getHttpCameraUrls } /* - * Class: edu_wpi_cscore_CameraServerCvJNI + * Class: edu_wpi_first_cscore_CameraServerCvJNI * Method: putSourceFrame * Signature: (IJ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerCvJNI_putSourceFrame +Java_edu_wpi_first_cscore_CameraServerCvJNI_putSourceFrame (JNIEnv* env, jclass, jint source, jlong imageNativeObj) { try { @@ -1220,12 +1220,12 @@ Java_edu_wpi_cscore_CameraServerCvJNI_putSourceFrame // int width, int height, int pixelFormat, int totalData /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: putRawSourceFrameBB * Signature: (ILjava/lang/Object;IIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_putRawSourceFrameBB +Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameBB (JNIEnv* env, jclass, jint source, jobject byteBuffer, jint width, jint height, jint pixelFormat, jint totalData) { @@ -1242,12 +1242,12 @@ Java_edu_wpi_cscore_CameraServerJNI_putRawSourceFrameBB } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: putRawSourceFrame * Signature: (IJIIII)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_putRawSourceFrame +Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrame (JNIEnv* env, jclass, jint source, jlong ptr, jint width, jint height, jint pixelFormat, jint totalData) { @@ -1263,12 +1263,12 @@ Java_edu_wpi_cscore_CameraServerJNI_putRawSourceFrame } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: notifySourceError * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_notifySourceError +Java_edu_wpi_first_cscore_CameraServerJNI_notifySourceError (JNIEnv* env, jclass, jint source, jstring msg) { if (!msg) { @@ -1281,12 +1281,12 @@ Java_edu_wpi_cscore_CameraServerJNI_notifySourceError } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceConnected * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceConnected +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceConnected (JNIEnv* env, jclass, jint source, jboolean connected) { CS_Status status = 0; @@ -1295,12 +1295,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceConnected } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceDescription * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceDescription +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceDescription (JNIEnv* env, jclass, jint source, jstring description) { if (!description) { @@ -1313,12 +1313,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceDescription } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createSourceProperty * Signature: (ILjava/lang/String;IIIIII)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createSourceProperty +Java_edu_wpi_first_cscore_CameraServerJNI_createSourceProperty (JNIEnv* env, jclass, jint source, jstring name, jint kind, jint minimum, jint maximum, jint step, jint defaultValue, jint value) { @@ -1331,12 +1331,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createSourceProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSourceEnumPropertyChoices * Signature: (II[Ljava/lang/Object;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumPropertyChoices +Java_edu_wpi_first_cscore_CameraServerJNI_setSourceEnumPropertyChoices (JNIEnv* env, jclass, jint source, jint property, jobjectArray choices) { if (!choices) { @@ -1361,12 +1361,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSourceEnumPropertyChoices } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createMjpegServer * Signature: (Ljava/lang/String;Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer +Java_edu_wpi_first_cscore_CameraServerJNI_createMjpegServer (JNIEnv* env, jclass, jstring name, jstring listenAddress, jint port) { if (!name) { @@ -1386,12 +1386,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createMjpegServer } /* - * Class: edu_wpi_cscore_CameraServerCvJNI + * Class: edu_wpi_first_cscore_CameraServerCvJNI * Method: createCvSink * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerCvJNI_createCvSink +Java_edu_wpi_first_cscore_CameraServerCvJNI_createCvSink (JNIEnv* env, jclass, jstring name) { if (!name) { @@ -1405,12 +1405,12 @@ Java_edu_wpi_cscore_CameraServerCvJNI_createCvSink } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createRawSink * Signature: (Ljava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createRawSink +Java_edu_wpi_first_cscore_CameraServerJNI_createRawSink (JNIEnv* env, jclass, jstring name) { if (!name) { @@ -1424,12 +1424,12 @@ Java_edu_wpi_cscore_CameraServerJNI_createRawSink } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkKind * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkKind +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkKind (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1439,12 +1439,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkKind } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkName * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkName +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkName (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1457,12 +1457,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkName } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkDescription * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkDescription +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkDescription (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1475,12 +1475,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkDescription } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkProperty +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkProperty (JNIEnv* env, jclass, jint sink, jstring name) { if (!name) { @@ -1494,12 +1494,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSinkProperties * Signature: (I)[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSinkProperties +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinkProperties (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1512,12 +1512,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSinkProperties } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSinkConfigJson * Signature: (ILjava/lang/String;)Z */ JNIEXPORT jboolean JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSinkConfigJson +Java_edu_wpi_first_cscore_CameraServerJNI_setSinkConfigJson (JNIEnv* env, jclass, jint source, jstring config) { CS_Status status = 0; @@ -1527,12 +1527,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSinkConfigJson } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkConfigJson * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkConfigJson +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkConfigJson (JNIEnv* env, jclass, jint source) { CS_Status status = 0; @@ -1542,12 +1542,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkConfigJson } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSinkSource * Signature: (II)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSinkSource +Java_edu_wpi_first_cscore_CameraServerJNI_setSinkSource (JNIEnv* env, jclass, jint sink, jint source) { CS_Status status = 0; @@ -1556,12 +1556,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSinkSource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkSourceProperty * Signature: (ILjava/lang/String;)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkSourceProperty +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSourceProperty (JNIEnv* env, jclass, jint sink, jstring name) { if (!name) { @@ -1576,12 +1576,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkSourceProperty } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkSource * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkSource +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkSource (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1591,12 +1591,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkSource } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: copySink * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_copySink +Java_edu_wpi_first_cscore_CameraServerJNI_copySink (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1606,12 +1606,12 @@ Java_edu_wpi_cscore_CameraServerJNI_copySink } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: releaseSink * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_releaseSink +Java_edu_wpi_first_cscore_CameraServerJNI_releaseSink (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1620,12 +1620,12 @@ Java_edu_wpi_cscore_CameraServerJNI_releaseSink } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getMjpegServerListenAddress * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerListenAddress +Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerListenAddress (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1637,12 +1637,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerListenAddress } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getMjpegServerPort * Signature: (I)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort +Java_edu_wpi_first_cscore_CameraServerJNI_getMjpegServerPort (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1652,12 +1652,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getMjpegServerPort } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSinkDescription * Signature: (ILjava/lang/String;)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSinkDescription +Java_edu_wpi_first_cscore_CameraServerJNI_setSinkDescription (JNIEnv* env, jclass, jint sink, jstring description) { if (!description) { @@ -1670,12 +1670,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSinkDescription } /* - * Class: edu_wpi_cscore_CameraServerCvJNI + * Class: edu_wpi_first_cscore_CameraServerCvJNI * Method: grabSinkFrame * Signature: (IJ)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerCvJNI_grabSinkFrame +Java_edu_wpi_first_cscore_CameraServerCvJNI_grabSinkFrame (JNIEnv* env, jclass, jint sink, jlong imageNativeObj) { try { @@ -1694,12 +1694,12 @@ Java_edu_wpi_cscore_CameraServerCvJNI_grabSinkFrame } /* - * Class: edu_wpi_cscore_CameraServerCvJNI + * Class: edu_wpi_first_cscore_CameraServerCvJNI * Method: grabSinkFrameTimeout * Signature: (IJD)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerCvJNI_grabSinkFrameTimeout +Java_edu_wpi_first_cscore_CameraServerCvJNI_grabSinkFrameTimeout (JNIEnv* env, jclass, jint sink, jlong imageNativeObj, jdouble timeout) { try { @@ -1735,12 +1735,12 @@ static void SetRawFrameData(JNIEnv* env, jobject rawFrameObj, } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: grabRawSinkFrameImpl * Signature: (ILjava/lang/Object;JLjava/lang/Object;III)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerJNI_grabRawSinkFrameImpl +Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrameImpl (JNIEnv* env, jclass, jint sink, jobject rawFrameObj, jlong rawFramePtr, jobject byteBuffer, jint width, jint height, jint pixelFormat) { @@ -1760,12 +1760,12 @@ Java_edu_wpi_cscore_CameraServerJNI_grabRawSinkFrameImpl } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: grabRawSinkFrameTimeoutImpl * Signature: (ILjava/lang/Object;JLjava/lang/Object;IIID)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerJNI_grabRawSinkFrameTimeoutImpl +Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrameTimeoutImpl (JNIEnv* env, jclass, jint sink, jobject rawFrameObj, jlong rawFramePtr, jobject byteBuffer, jint width, jint height, jint pixelFormat, jdouble timeout) @@ -1787,12 +1787,12 @@ Java_edu_wpi_cscore_CameraServerJNI_grabRawSinkFrameTimeoutImpl } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getSinkError * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getSinkError +Java_edu_wpi_first_cscore_CameraServerJNI_getSinkError (JNIEnv* env, jclass, jint sink) { CS_Status status = 0; @@ -1805,12 +1805,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getSinkError } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setSinkEnabled * Signature: (IZ)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setSinkEnabled +Java_edu_wpi_first_cscore_CameraServerJNI_setSinkEnabled (JNIEnv* env, jclass, jint sink, jboolean enabled) { CS_Status status = 0; @@ -1819,12 +1819,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setSinkEnabled } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: addListener * Signature: (Ljava/lang/Object;IZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_addListener +Java_edu_wpi_first_cscore_CameraServerJNI_addListener (JNIEnv* envouter, jclass, jobject listener, jint eventMask, jboolean immediateNotify) { @@ -1883,12 +1883,12 @@ Java_edu_wpi_cscore_CameraServerJNI_addListener } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: removeListener * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_removeListener +Java_edu_wpi_first_cscore_CameraServerJNI_removeListener (JNIEnv* env, jclass, jint handle) { CS_Status status = 0; @@ -1897,36 +1897,36 @@ Java_edu_wpi_cscore_CameraServerJNI_removeListener } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: createListenerPoller * Signature: ()I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_createListenerPoller +Java_edu_wpi_first_cscore_CameraServerJNI_createListenerPoller (JNIEnv*, jclass) { return cs::CreateListenerPoller(); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: destroyListenerPoller * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_destroyListenerPoller +Java_edu_wpi_first_cscore_CameraServerJNI_destroyListenerPoller (JNIEnv*, jclass, jint poller) { cs::DestroyListenerPoller(poller); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: addPolledListener * Signature: (IIZ)I */ JNIEXPORT jint JNICALL -Java_edu_wpi_cscore_CameraServerJNI_addPolledListener +Java_edu_wpi_first_cscore_CameraServerJNI_addPolledListener (JNIEnv* env, jclass, jint poller, jint eventMask, jboolean immediateNotify) { CS_Status status = 0; @@ -1936,12 +1936,12 @@ Java_edu_wpi_cscore_CameraServerJNI_addPolledListener } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: pollListener * Signature: (I)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_pollListener +Java_edu_wpi_first_cscore_CameraServerJNI_pollListener (JNIEnv* env, jclass, jint poller) { auto events = cs::PollListener(poller); @@ -1953,12 +1953,12 @@ Java_edu_wpi_cscore_CameraServerJNI_pollListener } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: pollListenerTimeout * Signature: (ID)[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_pollListenerTimeout +Java_edu_wpi_first_cscore_CameraServerJNI_pollListenerTimeout (JNIEnv* env, jclass, jint poller, jdouble timeout) { bool timed_out = false; @@ -1971,48 +1971,48 @@ Java_edu_wpi_cscore_CameraServerJNI_pollListenerTimeout } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: cancelPollListener * Signature: (I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_cancelPollListener +Java_edu_wpi_first_cscore_CameraServerJNI_cancelPollListener (JNIEnv*, jclass, jint poller) { cs::CancelPollListener(poller); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setTelemetryPeriod * Signature: (D)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setTelemetryPeriod +Java_edu_wpi_first_cscore_CameraServerJNI_setTelemetryPeriod (JNIEnv* env, jclass, jdouble seconds) { cs::SetTelemetryPeriod(seconds); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getTelemetryElapsedTime * Signature: ()D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getTelemetryElapsedTime +Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryElapsedTime (JNIEnv* env, jclass) { return cs::GetTelemetryElapsedTime(); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getTelemetryValue * Signature: (II)J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getTelemetryValue +Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryValue (JNIEnv* env, jclass, jint handle, jint kind) { CS_Status status = 0; @@ -2023,12 +2023,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getTelemetryValue } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getTelemetryAverageValue * Signature: (II)D */ JNIEXPORT jdouble JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getTelemetryAverageValue +Java_edu_wpi_first_cscore_CameraServerJNI_getTelemetryAverageValue (JNIEnv* env, jclass, jint handle, jint kind) { CS_Status status = 0; @@ -2039,12 +2039,12 @@ Java_edu_wpi_cscore_CameraServerJNI_getTelemetryAverageValue } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateUsbCameras * Signature: ()[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbCameras +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateUsbCameras (JNIEnv* env, jclass) { CS_Status status = 0; @@ -2065,12 +2065,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateUsbCameras } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSources * Signature: ()[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSources +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSources (JNIEnv* env, jclass) { CS_Status status = 0; @@ -2083,12 +2083,12 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSources } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: enumerateSinks * Signature: ()[I */ JNIEXPORT jintArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_enumerateSinks +Java_edu_wpi_first_cscore_CameraServerJNI_enumerateSinks (JNIEnv* env, jclass) { CS_Status status = 0; @@ -2101,24 +2101,24 @@ Java_edu_wpi_cscore_CameraServerJNI_enumerateSinks } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getHostname * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getHostname +Java_edu_wpi_first_cscore_CameraServerJNI_getHostname (JNIEnv* env, jclass) { return MakeJString(env, cs::GetHostname()); } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: getNetworkInterfaces * Signature: ()[Ljava/lang/Object; */ JNIEXPORT jobjectArray JNICALL -Java_edu_wpi_cscore_CameraServerJNI_getNetworkInterfaces +Java_edu_wpi_first_cscore_CameraServerJNI_getNetworkInterfaces (JNIEnv* env, jclass) { return MakeJStringArray(env, cs::GetNetworkInterfaces()); @@ -2158,12 +2158,12 @@ typedef JSingletonCallbackManager LoggerJNI; extern "C" { /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: setLogger * Signature: (Ljava/lang/Object;I)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_setLogger +Java_edu_wpi_first_cscore_CameraServerJNI_setLogger (JNIEnv* env, jclass, jobject func, jint minLevel) { if (!func) { @@ -2196,12 +2196,12 @@ Java_edu_wpi_cscore_CameraServerJNI_setLogger } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: allocateRawFrame * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_edu_wpi_cscore_CameraServerJNI_allocateRawFrame +Java_edu_wpi_first_cscore_CameraServerJNI_allocateRawFrame (JNIEnv*, jclass) { cs::RawFrame* rawFrame = new cs::RawFrame{}; @@ -2210,12 +2210,12 @@ Java_edu_wpi_cscore_CameraServerJNI_allocateRawFrame } /* - * Class: edu_wpi_cscore_CameraServerJNI + * Class: edu_wpi_first_cscore_CameraServerJNI * Method: freeRawFrame * Signature: (J)V */ JNIEXPORT void JNICALL -Java_edu_wpi_cscore_CameraServerJNI_freeRawFrame +Java_edu_wpi_first_cscore_CameraServerJNI_freeRawFrame (JNIEnv*, jclass, jlong rawFrame) { cs::RawFrame* ptr = diff --git a/cscore/src/test/java/edu/wpi/cscore/JNITest.java b/cscore/src/test/java/edu/wpi/first/cscore/JNITest.java similarity index 92% rename from cscore/src/test/java/edu/wpi/cscore/JNITest.java rename to cscore/src/test/java/edu/wpi/first/cscore/JNITest.java index 11f93f881f..40e2584a98 100644 --- a/cscore/src/test/java/edu/wpi/cscore/JNITest.java +++ b/cscore/src/test/java/edu/wpi/first/cscore/JNITest.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import org.junit.jupiter.api.Test; diff --git a/cscore/src/test/java/edu/wpi/cscore/UsbCameraTest.java b/cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java similarity index 98% rename from cscore/src/test/java/edu/wpi/cscore/UsbCameraTest.java rename to cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java index 13a68d00db..8a790fa788 100644 --- a/cscore/src/test/java/edu/wpi/cscore/UsbCameraTest.java +++ b/cscore/src/test/java/edu/wpi/first/cscore/UsbCameraTest.java @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -package edu.wpi.cscore; +package edu.wpi.first.cscore; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index cf57de6c8b..06ba471ffd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -4,9 +4,9 @@ package edu.wpi.first.wpilibj; -import edu.wpi.cscore.CameraServerJNI; import edu.wpi.first.cameraserver.CameraServerShared; import edu.wpi.first.cameraserver.CameraServerSharedStore; +import edu.wpi.first.cscore.CameraServerJNI; import edu.wpi.first.hal.FRCNetComm.tInstances; import edu.wpi.first.hal.FRCNetComm.tResourceType; import edu.wpi.first.hal.HAL; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInWidgets.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInWidgets.java index 84645c794e..7db33edee6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInWidgets.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInWidgets.java @@ -453,7 +453,7 @@ public enum BuiltInWidgets implements WidgetType { * Supported types: * * * *
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java index 3cfdc24b08..b80831c786 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.shuffleboard; -import edu.wpi.cscore.VideoSource; +import edu.wpi.first.cscore.VideoSource; import edu.wpi.first.wpilibj.Sendable; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; import edu.wpi.first.wpilibj.smartdashboard.SendableRegistry; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardContainer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardContainer.java index c81e372213..1f0ef5e70d 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardContainer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardContainer.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.shuffleboard; -import edu.wpi.cscore.VideoSource; +import edu.wpi.first.cscore.VideoSource; import edu.wpi.first.wpilibj.Sendable; import java.util.List; import java.util.NoSuchElementException; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java index 21ca13c2a1..a1002f5349 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java @@ -4,9 +4,9 @@ package edu.wpi.first.wpilibj.vision; -import edu.wpi.cscore.CvSink; -import edu.wpi.cscore.VideoSource; import edu.wpi.first.cameraserver.CameraServerSharedStore; +import edu.wpi.first.cscore.CvSink; +import edu.wpi.first.cscore.VideoSource; import org.opencv.core.Mat; /** diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionThread.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionThread.java index 78bb961a0a..5f23fe180f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionThread.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/VisionThread.java @@ -4,7 +4,7 @@ package edu.wpi.first.wpilibj.vision; -import edu.wpi.cscore.VideoSource; +import edu.wpi.first.cscore.VideoSource; /** * A vision thread is a special thread that runs a vision pipeline. It is a daemon thread; it diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/package-info.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/package-info.java index 371d30e15c..ba3e1e1914 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/package-info.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/vision/package-info.java @@ -13,7 +13,7 @@ * implements VisionRunner.Listener<MyFindTotePipeline> { * * // A USB camera connected to the roboRIO. - * private {@link edu.wpi.cscore.VideoSource VideoSource} usbCamera; + * private {@link edu.wpi.first.cscore.VideoSource VideoSource} usbCamera; * * // A vision pipeline. This could be handwritten or generated by GRIP. * // This has to implement {@link edu.wpi.first.wpilibj.vision.VisionPipeline}. diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java index 4d827fb7b8..e2766814a4 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/axiscamera/Robot.java @@ -4,10 +4,10 @@ package edu.wpi.first.wpilibj.examples.axiscamera; -import edu.wpi.cscore.AxisCamera; -import edu.wpi.cscore.CvSink; -import edu.wpi.cscore.CvSource; import edu.wpi.first.cameraserver.CameraServer; +import edu.wpi.first.cscore.AxisCamera; +import edu.wpi.first.cscore.CvSink; +import edu.wpi.first.cscore.CvSource; import edu.wpi.first.wpilibj.TimedRobot; import org.opencv.core.Mat; import org.opencv.core.Point; diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java index 6395da29b4..57ad77e11b 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/intermediatevision/Robot.java @@ -4,10 +4,10 @@ package edu.wpi.first.wpilibj.examples.intermediatevision; -import edu.wpi.cscore.CvSink; -import edu.wpi.cscore.CvSource; -import edu.wpi.cscore.UsbCamera; import edu.wpi.first.cameraserver.CameraServer; +import edu.wpi.first.cscore.CvSink; +import edu.wpi.first.cscore.CvSource; +import edu.wpi.first.cscore.UsbCamera; import edu.wpi.first.wpilibj.TimedRobot; import org.opencv.core.Mat; import org.opencv.core.Point;