Hand fix cscore

Author: pjreiniger

subprojects/robotpy-cscore/pyproject.toml

@@ -108,10 +108,25 @@ CameraServer = "wpi/cameraserver/CameraServer.hpp"
 
 # cscore
 cscore_cpp = "wpi/cs/cscore_cpp.hpp"
-cscore_oo = "wpi/cs/cscore_oo.hpp"
-cscore_cv = "wpi/cs/cscore_cv.hpp"
 cscore_runloop = "wpi/cs/cscore_runloop.hpp"
 
+CvSink = "wpi/cs/CvSink.hpp"
+CvSource = "wpi/cs/CvSource.hpp"
+HttpCamera = "wpi/cs/HttpCamera.hpp"
+ImageSink = "wpi/cs/ImageSink.hpp"
+ImageSource = "wpi/cs/ImageSource.hpp"
+MjpegServer = "wpi/cs/MjpegServer.hpp"
+RawEvent = "wpi/cs/RawEvent.hpp"
+UsbCamera = "wpi/cs/UsbCamera.hpp"
+UsbCameraInfo = "wpi/cs/UsbCameraInfo.hpp"
+VideoCamera = "wpi/cs/VideoCamera.hpp"
+VideoEvent = "wpi/cs/VideoEvent.hpp"
+VideoListener = "wpi/cs/VideoListener.hpp"
+VideoMode = "wpi/cs/VideoMode.hpp"
+VideoProperty = "wpi/cs/VideoProperty.hpp"
+VideoSink = "wpi/cs/VideoSink.hpp"
+VideoSource = "wpi/cs/VideoSource.hpp"
+
 [tool.semiwrap.export_type_casters.cscore-casters]
 pypackage = "cscore"
 includedir = ["cscore"]

subprojects/robotpy-cscore/semiwrap/CameraServer.yml

@@ -24,7 +24,9 @@ classes:
         overloads:
           "":
           const cs::VideoSource&:
+          const cs::VideoSource&, wpi::util::PixelFormat:
           std::string_view:
+          std::string_view, wpi::util::PixelFormat:
       PutVideo:
       AddServer:
         overloads:

…ts/robotpy-cscore/semiwrap/cscore_cv.yml …jects/robotpy-cscore/semiwrap/CvSink.ymlsubprojects/robotpy-cscore/semiwrap/cscore_cv.yml renamed to subprojects/robotpy-cscore/semiwrap/CvSink.yml subprojects/robotpy-cscore/semiwrap/cscore_cv.yml renamed to subprojects/robotpy-cscore/semiwrap/CvSink.yml

@@ -1,39 +1,5 @@
 
-extra_includes:
-- opencv2/core/core.hpp
-- cvnp/cvnp.h
-
-functions:
-  CS_PutSourceFrame:
-    ignore: true
-  CS_GrabSinkFrame:
-    ignore: true
-  CS_GrabSinkFrameTimeout:
-    ignore: true
-  CS_GrabSinkFrameCpp:
-    ignore: true
-  CS_GrabSinkFrameTimeoutCpp:
-    ignore: true
-  CS_PutSourceFrameCpp:
-    ignore: true
-  PutSourceFrame:
-    ignore: true
-  GrabSinkFrame:
-    ignore: true
-  GrabSinkFrameTimeout:
-    ignore: true
 classes:
-  wpi::cs::CvSource:
-    doc: A source for user code to provide OpenCV images as video frames.
-    force_no_trampoline: true
-    methods:
-      CvSource:
-        overloads:
-          "":
-            ignore: true
-          std::string_view, const VideoMode&:
-          std::string_view, VideoMode::PixelFormat, int, int, int:
-      PutFrame:
   wpi::cs::CvSink:
     doc: A sink for user code to accept video frames as OpenCV images.
     force_no_trampoline: true
@@ -45,13 +11,17 @@ classes:
           std::string_view:
           std::string_view, std::function<void (uint64_t time)>:
             ignore: true
+          std::string_view, wpi::util::PixelFormat:
       GrabFrame:
         cpp_code: |
           [](wpi::cs::CvSink &self, cv::Mat& image, double timeout) -> std::tuple<uint64_t, cv::Mat> {
             py::gil_scoped_release unlock;
             auto result = self.GrabFrame(image, timeout);
             return std::make_tuple(result, image);
           }
+      GrabFrameDirect:
+      GrabFrameDirectLastTime:
+      GrabFrameNoTimeoutDirect:
       GrabFrameNoTimeout:
         cpp_code: |
           [](wpi::cs::CvSink &self, cv::Mat& image) -> std::tuple<uint64_t, cv::Mat> {

subprojects/robotpy-cscore/semiwrap/CvSource.yml

@@ -0,0 +1,17 @@
+classes:
+  wpi::cs::CvSource:
+    doc: A source for user code to provide OpenCV images as video frames.
+    force_no_trampoline: true
+    methods:
+      CvSource:
+        overloads:
+          "":
+            ignore: true
+          std::string_view, const VideoMode&:
+          std::string_view, VideoMode::PixelFormat, int, int, int:
+          std::string_view, wpi::util::PixelFormat, int, int, int:
+      PutFrame:
+        overloads:
+          cv::Mat&:
+          cv::Mat&, wpi::util::PixelFormat, bool:
+  

subprojects/robotpy-cscore/semiwrap/HttpCamera.yml

@@ -0,0 +1,23 @@
+classes:
+  wpi::cs::HttpCamera:
+    force_no_trampoline: true
+    constants:
+    - wpi::cs::HttpCamera::HttpCameraKind::kUnknown
+    enums:
+      HttpCameraKind:
+    methods:
+      HttpCamera:
+        overloads:
+          std::string_view, std::string_view, HttpCameraKind:
+          std::string_view, const char*, HttpCameraKind:
+          std::string_view, const std::string&, HttpCameraKind:
+          std::string_view, std::span<const std::string>, HttpCameraKind:
+          std::string_view, std::initializer_list<T>, HttpCameraKind:
+            ignore: true
+      GetHttpCameraKind:
+      SetUrls:
+        overloads:
+          std::span<const std::string>:
+          std::initializer_list<T>:
+            ignore: true
+      GetUrls:

subprojects/robotpy-cscore/semiwrap/ImageSink.yml

@@ -0,0 +1,9 @@
+
+classes:
+  wpi::cs::ImageSink:
+    force_no_trampoline: true
+    methods:
+      SetDescription:
+      GetError:
+      SetEnabled:
+      ImageSink:

subprojects/robotpy-cscore/semiwrap/ImageSource.yml

@@ -0,0 +1,18 @@
+classes:
+
+  wpi::cs::ImageSource:
+    force_no_trampoline: true
+    methods:
+      NotifyError:
+      SetConnected:
+      SetDescription:
+      CreateProperty:
+      CreateIntegerProperty:
+      CreateBooleanProperty:
+      CreateStringProperty:
+      SetEnumPropertyChoices:
+        overloads:
+          const VideoProperty&, std::span<const std::string>:
+          const VideoProperty&, std::initializer_list<T>:
+            ignore: true
+      ImageSource:

subprojects/robotpy-cscore/semiwrap/MjpegServer.yml

@@ -0,0 +1,16 @@
+
+classes:
+  wpi::cs::MjpegServer:
+    force_no_trampoline: true
+    methods:
+      MjpegServer:
+        overloads:
+          "":
+          std::string_view, std::string_view, int:
+          std::string_view, int:
+      GetListenAddress:
+      GetPort:
+      SetResolution:
+      SetFPS:
+      SetCompression:
+      SetDefaultCompression:

subprojects/robotpy-cscore/semiwrap/RawEvent.yml

@@ -0,0 +1,39 @@
+classes:
+  wpi::cs::RawEvent:
+    attributes:
+      kind:
+        ignore: true
+      sourceHandle:
+        ignore: true
+      sinkHandle:
+        ignore: true
+      name:
+        ignore: true
+      mode:
+        ignore: true
+      propertyHandle:
+        ignore: true
+      propertyKind:
+        ignore: true
+      value:
+        ignore: true
+      valueStr:
+        ignore: true
+      listener:
+        ignore: true
+    enums:
+      Kind:
+        ignore: true
+    methods:
+      RawEvent:
+        overloads:
+          "":
+            ignore: true
+          RawEvent::Kind:
+            ignore: true
+          std::string_view, CS_Handle, RawEvent::Kind:
+            ignore: true
+          std::string_view, CS_Source, const VideoMode&:
+            ignore: true
+          std::string_view, CS_Source, RawEvent::Kind, CS_Property, CS_PropertyKind, int, std::string_view:
+            ignore: true

subprojects/robotpy-cscore/semiwrap/UsbCamera.yml

@@ -0,0 +1,14 @@
+classes:
+  wpi::cs::UsbCamera:
+    force_no_trampoline: true
+    methods:
+      UsbCamera:
+        overloads:
+          "":
+          std::string_view, int:
+          std::string_view, std::string_view:
+      EnumerateUsbCameras:
+      SetPath:
+      GetPath:
+      GetInfo:
+      SetConnectVerbose: