Add stream settings to webdash and examples (#61)

deps/examples/cpp-multiCameraServer/main.cpp

@@ -41,7 +41,15 @@
                        "name": <property name>
                        "value": <property value>
                    }
-               ]
+               ],
+               "stream": {                              // optional
+                   "properties": [
+                       {
+                           "name": <stream property name>
+                           "value": <stream property value>
+                       }
+                   ]
+               }
            }
        ]
    }
@@ -58,6 +66,7 @@ struct CameraConfig {
   std::string name;
   std::string path;
   wpi::json config;
+  wpi::json streamConfig;
 };
 
 std::vector<CameraConfig> cameraConfigs;
@@ -86,6 +95,9 @@ bool ReadCameraConfig(const wpi::json& config) {
     return false;
   }
 
+  // stream properties
+  if (config.count("stream") != 0) c.streamConfig = config.at("stream");
+
   c.config = config;
 
   cameraConfigs.emplace_back(std::move(c));
@@ -158,12 +170,16 @@ bool ReadConfig() {
 cs::UsbCamera StartCamera(const CameraConfig& config) {
   wpi::outs() << "Starting camera '" << config.name << "' on " << config.path
               << '\n';
-  auto camera = frc::CameraServer::GetInstance()->StartAutomaticCapture(
-      config.name, config.path);
+  cs::UsbCamera camera{config.name, config.path};
+  auto inst = frc::CameraServer::GetInstance();
+  auto server = inst->StartAutomaticCapture(camera);
 
   camera.SetConfigJson(config.config);
   camera.SetConnectionStrategy(cs::VideoSource::kConnectionKeepOpen);
 
+  if (config.streamConfig.is_object())
+    server.SetConfigJson(config.streamConfig);
+
   return camera;
 }
 

deps/examples/java-multiCameraServer/src/main/java/Main.java

@@ -18,6 +18,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import edu.wpi.cscore.MjpegServer;
+import edu.wpi.cscore.UsbCamera;
 import edu.wpi.cscore.VideoSource;
 import edu.wpi.first.cameraserver.CameraServer;
 import edu.wpi.first.networktables.NetworkTableInstance;
@@ -47,7 +49,15 @@ import org.opencv.core.Mat;
                        "name": <property name>
                        "value": <property value>
                    }
-               ]
+               ],
+               "stream": {                              // optional
+                   "properties": [
+                       {
+                           "name": <stream property name>
+                           "value": <stream property value>
+                       }
+                   ]
+               }
            }
        ]
    }
@@ -61,6 +71,7 @@ public final class Main {
     public String name;
     public String path;
     public JsonObject config;
+    public JsonElement streamConfig;
   }
 
   public static int team;
@@ -99,6 +110,9 @@ public final class Main {
     }
     cam.path = pathElement.getAsString();
 
+    // stream properties
+    cam.streamConfig = config.get("stream");
+
     cam.config = config;
 
     cameraConfigs.add(cam);
@@ -167,14 +181,19 @@ public final class Main {
    */
   public static VideoSource startCamera(CameraConfig config) {
     System.out.println("Starting camera '" + config.name + "' on " + config.path);
-    VideoSource camera = CameraServer.getInstance().startAutomaticCapture(
-        config.name, config.path);
+    UsbCamera camera = new UsbCamera(config.name, config.path);
+    CameraServer inst = CameraServer.getInstance();
+    MjpegServer server = inst.startAutomaticCapture(camera);
 
     Gson gson = new GsonBuilder().create();
 
     camera.setConfigJson(gson.toJson(config.config));
     camera.setConnectionStrategy(VideoSource.ConnectionStrategy.kKeepOpen);
 
+    if (config.streamConfig != null) {
+      server.setConfigJson(gson.toJson(config.streamConfig));
+    }
+
     return camera;
   }
 

deps/examples/python-multiCameraServer/multiCameraServer.py

@@ -10,7 +10,7 @@ import json
 import time
 import sys
 
-from cscore import CameraServer, VideoSource
+from cscore import CameraServer, VideoSource, UsbCamera, MjpegServer
 from networktables import NetworkTablesInstance
 
 #   JSON format:
@@ -33,7 +33,15 @@ from networktables import NetworkTablesInstance
 #                       "name": <property name>
 #                       "value": <property value>
 #                   }
-#               ]
+#               ],
+#               "stream": {                              // optional
+#                   "properties": [
+#                       {
+#                           "name": <stream property name>
+#                           "value": <stream property value>
+#                       }
+#                   ]
+#               }
 #           }
 #       ]
 #   }
@@ -68,6 +76,9 @@ def readCameraConfig(config):
         parseError("camera '{}': could not read path".format(cam.name))
         return False
 
+    # stream properties
+    cam.streamConfig = config.get("stream")
+
     cam.config = config
 
     cameraConfigs.append(cam)
@@ -123,12 +134,16 @@ def readConfig():
 """Start running the camera."""
 def startCamera(config):
     print("Starting camera '{}' on {}".format(config.name, config.path))
-    camera = CameraServer.getInstance() \
-        .startAutomaticCapture(name=config.name, path=config.path)
+    camera = UsbCamera(config.name, config.path)
+    inst = CameraServer.getInstance()
+    server = inst.startAutomaticCapture(camera=camera, return_server=True)
 
     camera.setConfigJson(json.dumps(config.config))
     camera.setConnectionStrategy(VideoSource.ConnectionStrategy.kKeepOpen)
 
+    if config.streamConfig is not None:
+        server.setConfigJson(json.dumps(config.streamConfig))
+
     return camera
 
 if __name__ == "__main__":