Fork Sync: Update from parent repository

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

@@ -9,10 +9,10 @@
 #include <span>
 #include <string>
 #include <string_view>
+#include <vector>
 
 #include <wpi/deprecated.h>
 
-#include "cscore.h"
 #include "cscore_cv.h"
 
 namespace frc {
@@ -130,7 +130,9 @@ class CameraServer {
    */
   template <typename T>
   [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
-  static cs::AxisCamera AddAxisCamera(std::initializer_list<T> hosts);
+  static cs::AxisCamera AddAxisCamera(std::initializer_list<T> hosts) {
+    return AddAxisCamera("Axis Camera", hosts);
+  }
 
   /**
    * Adds an Axis IP camera.
@@ -185,7 +187,14 @@ class CameraServer {
   template <typename T>
   [[deprecated("Call StartAutomaticCapture with a HttpCamera instead.")]]
   static cs::AxisCamera AddAxisCamera(std::string_view name,
-                                      std::initializer_list<T> hosts);
+                                      std::initializer_list<T> hosts) {
+    std::vector<std::string> vec;
+    vec.reserve(hosts.size());
+    for (const auto& host : hosts) {
+      vec.emplace_back(host);
+    }
+    return AddAxisCamera(name, vec);
+  }
   WPI_UNIGNORE_DEPRECATED
 
   /**
@@ -316,5 +325,3 @@ class CameraServer {
 };
 
 }  // namespace frc
-
-#include "cameraserver/CameraServer.inc"

cameraserver/src/main/native/include/vision/VisionRunner.h

@@ -8,7 +8,6 @@
 #include <functional>
 #include <memory>
 
-#include "cscore.h"
 #include "cscore_cv.h"
 #include "vision/VisionPipeline.h"
 
@@ -81,17 +80,35 @@ class VisionRunnerBase {
 template <typename T>
 class VisionRunner : public VisionRunnerBase {
  public:
+  /**
+   * Creates a new vision runner. It will take images from the {@code
+   * videoSource}, send them to the {@code pipeline}, and call the {@code
+   * listener} when the pipeline has finished to alert user code when it is safe
+   * to access the pipeline's outputs.
+   *
+   * @param videoSource The video source to use to supply images for the
+   *                    pipeline
+   * @param pipeline    The vision pipeline to run
+   * @param listener    A function to call after the pipeline has finished
+   *                    running
+   */
   VisionRunner(cs::VideoSource videoSource, T* pipeline,
-               std::function<void(T&)> listener);
+               std::function<void(T&)> listener)
+      : VisionRunnerBase(videoSource),
+        m_pipeline(pipeline),
+        m_listener(listener) {}
+
   virtual ~VisionRunner() = default;
 
  protected:
-  void DoProcess(cv::Mat& image) override;
+  void DoProcess(cv::Mat& image) override {
+    m_pipeline->Process(image);
+    m_listener(*m_pipeline);
+  }
 
  private:
   T* m_pipeline;
   std::function<void(T&)> m_listener;
 };
-}  // namespace frc
 
-#include "VisionRunner.inc"
+}  // namespace frc