[cscore] Deprecate AxisCamera (#6579)

cameraserver/src/main/java/edu/wpi/first/cameraserver/CameraServer.java

@@ -634,7 +634,10 @@ public final class CameraServer {
    *
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
    * @return The Axis camera capturing images.
+   * @deprecated Call startAutomaticCapture with a HttpCamera instead.
    */
+  @Deprecated(forRemoval = true, since = "2025")
+  @SuppressWarnings("removal")
   public static AxisCamera addAxisCamera(String host) {
     return addAxisCamera("Axis Camera", host);
   }
@@ -646,7 +649,10 @@ public final class CameraServer {
    *
    * @param hosts Array of Camera host IPs/DNS names
    * @return The Axis camera capturing images.
+   * @deprecated Call startAutomaticCapture with a HttpCamera instead.
    */
+  @Deprecated(forRemoval = true, since = "2025")
+  @SuppressWarnings("removal")
   public static AxisCamera addAxisCamera(String[] hosts) {
     return addAxisCamera("Axis Camera", hosts);
   }
@@ -657,7 +663,10 @@ public final class CameraServer {
    * @param name The name to give the camera
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
    * @return The Axis camera capturing images.
+   * @deprecated Call startAutomaticCapture with a HttpCamera instead.
    */
+  @Deprecated(forRemoval = true, since = "2025")
+  @SuppressWarnings("removal")
   public static AxisCamera addAxisCamera(String name, String host) {
     AxisCamera camera = new AxisCamera(name, host);
     // Create a passthrough MJPEG server for USB access
@@ -672,7 +681,10 @@ public final class CameraServer {
    * @param name The name to give the camera
    * @param hosts Array of Camera host IPs/DNS names
    * @return The Axis camera capturing images.
+   * @deprecated Call startAutomaticCapture with a HttpCamera instead.
    */
+  @Deprecated(forRemoval = true, since = "2025")
+  @SuppressWarnings("removal")
   public static AxisCamera addAxisCamera(String name, String[] hosts) {
     AxisCamera camera = new AxisCamera(name, hosts);
     // Create a passthrough MJPEG server for USB access

cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp

@@ -504,6 +504,7 @@ cs::UsbCamera CameraServer::StartAutomaticCapture(std::string_view name,
   return camera;
 }
 
+WPI_IGNORE_DEPRECATED
 cs::AxisCamera CameraServer::AddAxisCamera(std::string_view host) {
   return AddAxisCamera("Axis Camera", host);
 }
@@ -559,7 +560,7 @@ cs::AxisCamera CameraServer::AddAxisCamera(std::string_view name,
   csShared->ReportAxisCamera(camera.GetHandle());
   return camera;
 }
-
+WPI_UNIGNORE_DEPRECATED
 cs::MjpegServer CameraServer::AddSwitchedCamera(std::string_view name) {
   auto& inst = ::GetInstance();
   // create a dummy CvSource

cameraserver/src/main/native/include/cameraserver/CameraServer.h

@@ -10,6 +10,8 @@
 #include <string>
 #include <string_view>
 
+#include <wpi/deprecated.h>
+
 #include "cscore.h"
 #include "cscore_cv.h"
 
@@ -73,13 +75,16 @@ class CameraServer {
    */
   static cs::MjpegServer StartAutomaticCapture(const cs::VideoSource& camera);
 
+  WPI_IGNORE_DEPRECATED
   /**
    * Adds an Axis IP camera.
    *
    * This overload calls AddAxisCamera() with name "Axis Camera".
    *
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view host);
 
   /**
@@ -88,7 +93,9 @@ class CameraServer {
    * This overload calls AddAxisCamera() with name "Axis Camera".
    *
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(const char* host);
 
   /**
@@ -97,7 +104,9 @@ class CameraServer {
    * This overload calls AddAxisCamera() with name "Axis Camera".
    *
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(const std::string& host);
 
   /**
@@ -106,7 +115,9 @@ class CameraServer {
    * This overload calls AddAxisCamera() with name "Axis Camera".
    *
    * @param hosts Array of Camera host IPs/DNS names
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::span<const std::string> hosts);
 
   /**
@@ -115,8 +126,10 @@ class CameraServer {
    * This overload calls AddAxisCamera() with name "Axis Camera".
    *
    * @param hosts Array of Camera host IPs/DNS names
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
   template <typename T>
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::initializer_list<T> hosts);
 
   /**
@@ -124,7 +137,9 @@ class CameraServer {
    *
    * @param name The name to give the camera
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name,
                                       std::string_view host);
 
@@ -133,7 +148,9 @@ class CameraServer {
    *
    * @param name The name to give the camera
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name, const char* host);
 
   /**
@@ -141,7 +158,9 @@ class CameraServer {
    *
    * @param name The name to give the camera
    * @param host Camera host IP or DNS name (e.g. "10.x.y.11")
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name,
                                       const std::string& host);
 
@@ -150,7 +169,9 @@ class CameraServer {
    *
    * @param name The name to give the camera
    * @param hosts Array of Camera host IPs/DNS names
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name,
                                       std::span<const std::string> hosts);
 
@@ -159,10 +180,13 @@ class CameraServer {
    *
    * @param name The name to give the camera
    * @param hosts Array of Camera host IPs/DNS names
+   * @deprecated Call StartAutomaticCapture with a HttpCamera instead.
    */
   template <typename T>
+  [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name,
                                       std::initializer_list<T> hosts);
+  WPI_UNIGNORE_DEPRECATED
 
   /**
    * Adds a virtual camera for switching between two streams.  Unlike the

cameraserver/src/main/native/include/cameraserver/CameraServer.inc

@@ -11,6 +11,7 @@
 
 namespace frc {
 
+WPI_IGNORE_DEPRECATED
 template <typename T>
 inline cs::AxisCamera CameraServer::AddAxisCamera(
     std::initializer_list<T> hosts) {
@@ -27,5 +28,6 @@ inline cs::AxisCamera CameraServer::AddAxisCamera(
   }
   return AddAxisCamera(name, vec);
 }
+WPI_UNIGNORE_DEPRECATED
 
 }  // namespace frc

cscore/src/main/java/edu/wpi/first/cscore/AxisCamera.java

@@ -4,7 +4,12 @@
 
 package edu.wpi.first.cscore;
 
-/** A source that represents an Axis IP camera. */
+/**
+ * A source that represents an Axis IP camera.
+ *
+ * @deprecated Use HttpCamera instead.
+ */
+@Deprecated(forRemoval = true, since = "2025")
 public class AxisCamera extends HttpCamera {
   private static String hostToUrl(String host) {
     return "http://" + host + "/mjpg/video.mjpg";

cscore/src/main/native/include/cscore_oo.h

@@ -692,8 +692,10 @@ class HttpCamera : public VideoCamera {
 
 /**
  * A source that represents an Axis IP camera.
+ *
+ * @deprecated Use HttpCamera instead.
  */
-class AxisCamera : public HttpCamera {
+class [[deprecated("Use HttpCamera instead.")]] AxisCamera : public HttpCamera {
   static std::string HostToUrl(std::string_view host);
   static std::vector<std::string> HostToUrl(std::span<const std::string> hosts);
   template <typename T>

cscore/src/main/native/include/cscore_oo.inc

@@ -11,6 +11,8 @@
 #include <utility>
 #include <vector>
 
+#include <wpi/deprecated.h>
+
 #include "cscore_oo.h"
 
 namespace cs {
@@ -350,7 +352,7 @@ inline std::vector<std::string> HttpCamera::GetUrls() const {
   m_status = 0;
   return ::cs::GetHttpCameraUrls(m_handle, &m_status);
 }
-
+WPI_IGNORE_DEPRECATED
 inline std::vector<std::string> AxisCamera::HostToUrl(
     std::span<const std::string> hosts) {
   std::vector<std::string> rv;
@@ -389,6 +391,7 @@ template <typename T>
 inline AxisCamera::AxisCamera(std::string_view name,
                               std::initializer_list<T> hosts)
     : HttpCamera(name, HostToUrl(hosts), kAxis) {}
+WPI_UNIGNORE_DEPRECATED
 
 inline void ImageSource::NotifyError(std::string_view msg) {
   m_status = 0;

wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp

@@ -10,16 +10,18 @@
 
 /**
  * This is a demo program showing the use of OpenCV to do vision processing. The
- * image is acquired from the Axis camera, then a rectangle is put on the image
+ * image is acquired from an HTTP camera, then a rectangle is put on the image
  * and sent to the dashboard. OpenCV has many methods for different types of
  * processing.
  */
 class Robot : public frc::TimedRobot {
  private:
   static void VisionThread() {
-    // Get the Axis camera from CameraServer
-    cs::AxisCamera camera =
-        frc::CameraServer::AddAxisCamera("axis-camera.local");
+    // Create an HTTP camera. The address will need to be modified to have the
+    // correct team number. The exact path will depend on the source.
+    cs::HttpCamera camera{"My Camera", "http://10.x.y.11/video/stream.mjpg"};
+    // Start capturing images
+    frc::CameraServer::StartAutomaticCapture(camera);
     // Set the resolution
     camera.SetResolution(640, 480);
 

wpilibcExamples/src/main/cpp/examples/examples.json

@@ -310,12 +310,12 @@
     "commandversion": 2
   },
   {
-    "name": "Axis Camera Sample",
-    "description": "Acquire images from an Axis network camera and adds some annotation to the image (as you might do for showing operators the result of some image recognition), and sends it to the dashboard for display.",
+    "name": "HTTP Camera",
+    "description": "Acquire images from an HTTP network camera and adds some annotation to the image (as you might do for showing operators the result of some image recognition), and sends it to the dashboard for display.",
     "tags": [
       "Vision"
     ],
-    "foldername": "AxisCameraSample",
+    "foldername": "HttpCamera",
     "gradlebase": "cpp",
     "commandversion": 2
   },

wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json

@@ -318,12 +318,12 @@
     "commandversion": 2
   },
   {
-    "name": "Axis Camera Sample",
-    "description": "Acquire images from an Axis network camera and adds some annotation to the image (as you might do for showing operators the result of some image recognition), and sends it to the dashboard for display.",
+    "name": "HTTP Camera",
+    "description": "Acquire images from an HTTP network camera and adds some annotation to the image (as you might do for showing operators the result of some image recognition), and sends it to the dashboard for display.",
     "tags": [
       "Vision"
     ],
-    "foldername": "axiscamera",
+    "foldername": "httpcamera",
     "gradlebase": "java",
     "mainclass": "Main",
     "commandversion": 2

wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Main.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.first.wpilibj.examples.axiscamera;
+package edu.wpi.first.wpilibj.examples.httpcamera;
 
 import edu.wpi.first.wpilibj.RobotBase;
 

wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/httpcamera/Robot.java

@@ -2,12 +2,12 @@
 // 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.first.wpilibj.examples.axiscamera;
+package edu.wpi.first.wpilibj.examples.httpcamera;
 
 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.cscore.HttpCamera;
 import edu.wpi.first.wpilibj.TimedRobot;
 import org.opencv.core.Mat;
 import org.opencv.core.Point;
@@ -16,7 +16,7 @@ import org.opencv.imgproc.Imgproc;
 
 /**
  * This is a demo program showing the use of OpenCV to do vision processing. The image is acquired
- * from the Axis camera, then a rectangle is put on the image and sent to the dashboard. OpenCV has
+ * from an HTTP camera, then a rectangle is put on the image and sent to the dashboard. OpenCV has
  * many methods for different types of processing.
  */
 public class Robot extends TimedRobot {
@@ -27,8 +27,12 @@ public class Robot extends TimedRobot {
     m_visionThread =
         new Thread(
             () -> {
-              // Get the Axis camera from CameraServer
-              AxisCamera camera = CameraServer.addAxisCamera("axis-camera.local");
+              // Create an HTTP camera. The address will need to be modified to have the correct
+              // team number. The exact path will depend on the source.
+              HttpCamera camera =
+                  new HttpCamera("HTTP Camera", "http://10.x.y.11/video/stream.mjpg");
+              // Start capturing images
+              CameraServer.startAutomaticCapture(camera);
               // Set the resolution
               camera.setResolution(640, 480);