Move image_streamer to frc971
So we can share code between 2022 and 2023.
Signed-off-by: milind-u <milind.upadhyay@gmail.com>
Change-Id: I3051d86306d78a19be7695dd70986fba7702c597
diff --git a/y2022/image_streamer/BUILD b/frc971/image_streamer/BUILD
similarity index 79%
rename from y2022/image_streamer/BUILD
rename to frc971/image_streamer/BUILD
index 0305dc1..dce389a 100644
--- a/y2022/image_streamer/BUILD
+++ b/frc971/image_streamer/BUILD
@@ -8,25 +8,18 @@
),
)
-filegroup(
- name = "image_streamer_start",
- srcs = ["image_streamer_start.sh"],
- visibility = ["//visibility:public"],
-)
-
cc_binary(
name = "image_streamer",
srcs = ["image_streamer.cc"],
args = [
- "--data_dir=y2022/image_streamer/www",
+ "--data_dir=frc971/image_streamer/www",
],
copts = [
"-Wno-cast-align",
],
data = [
- "//y2022:aos_config",
- "//y2022/image_streamer/www:files",
- "//y2022/image_streamer/www:main_bundle.min.js",
+ "//frc971/image_streamer/www:files",
+ "//frc971/image_streamer/www:main_bundle.min.js",
],
target_compatible_with = select({
"@platforms//cpu:x86_64": [],
diff --git a/y2022/image_streamer/image_streamer.cc b/frc971/image_streamer/image_streamer.cc
similarity index 98%
rename from y2022/image_streamer/image_streamer.cc
rename to frc971/image_streamer/image_streamer.cc
index ef6657e..de56d55 100644
--- a/y2022/image_streamer/image_streamer.cc
+++ b/frc971/image_streamer/image_streamer.cc
@@ -47,7 +47,7 @@
GST_PLUGIN_STATIC_DECLARE(x264);
}
-DEFINE_string(config, "y2022/aos_config.json",
+DEFINE_string(config, "aos_config.json",
"Name of the config file to replay using.");
DEFINE_string(device, "/dev/video0",
"Camera fd. Ignored if reading from channel");
@@ -59,6 +59,7 @@
DEFINE_int32(brightness, 50, "Camera brightness");
DEFINE_int32(exposure, 300, "Manual exposure");
DEFINE_int32(bitrate, 500000, "H264 encode bitrate");
+DEFINE_int32(streaming_port, 1180, "Port to stream images on with seasocks");
DEFINE_int32(min_port, 5800, "Min rtp port");
DEFINE_int32(max_port, 5810, "Max rtp port");
DEFINE_string(listen_on, "",
@@ -653,7 +654,7 @@
std::make_shared<WebsocketHandler>(&event_loop, &server);
server.addWebSocketHandler("/ws", websocket_handler);
- server.startListening(1180);
+ server.startListening(FLAGS_streaming_port);
server.setStaticPath(FLAGS_data_dir.c_str());
aos::internal::EPoll *epoll = event_loop.epoll();
diff --git a/y2022/image_streamer/www/BUILD b/frc971/image_streamer/www/BUILD
similarity index 100%
rename from y2022/image_streamer/www/BUILD
rename to frc971/image_streamer/www/BUILD
diff --git a/y2022/image_streamer/www/index.html b/frc971/image_streamer/www/index.html
similarity index 100%
rename from y2022/image_streamer/www/index.html
rename to frc971/image_streamer/www/index.html
diff --git a/y2022/image_streamer/www/main.ts b/frc971/image_streamer/www/main.ts
similarity index 100%
rename from y2022/image_streamer/www/main.ts
rename to frc971/image_streamer/www/main.ts
diff --git a/y2022/image_streamer/www/proxy.ts b/frc971/image_streamer/www/proxy.ts
similarity index 100%
rename from y2022/image_streamer/www/proxy.ts
rename to frc971/image_streamer/www/proxy.ts
diff --git a/y2022/image_streamer/www_defaults/_404.png b/frc971/image_streamer/www_defaults/_404.png
similarity index 100%
rename from y2022/image_streamer/www_defaults/_404.png
rename to frc971/image_streamer/www_defaults/_404.png
Binary files differ
diff --git a/y2022/image_streamer/www_defaults/_error.css b/frc971/image_streamer/www_defaults/_error.css
similarity index 100%
rename from y2022/image_streamer/www_defaults/_error.css
rename to frc971/image_streamer/www_defaults/_error.css
diff --git a/y2022/image_streamer/www_defaults/_error.html b/frc971/image_streamer/www_defaults/_error.html
similarity index 100%
rename from y2022/image_streamer/www_defaults/_error.html
rename to frc971/image_streamer/www_defaults/_error.html
diff --git a/y2022/image_streamer/www_defaults/_jquery.min.js b/frc971/image_streamer/www_defaults/_jquery.min.js
similarity index 100%
rename from y2022/image_streamer/www_defaults/_jquery.min.js
rename to frc971/image_streamer/www_defaults/_jquery.min.js
diff --git a/y2022/image_streamer/www_defaults/_seasocks.css b/frc971/image_streamer/www_defaults/_seasocks.css
similarity index 100%
rename from y2022/image_streamer/www_defaults/_seasocks.css
rename to frc971/image_streamer/www_defaults/_seasocks.css
diff --git a/y2022/image_streamer/www_defaults/_stats.html b/frc971/image_streamer/www_defaults/_stats.html
similarity index 100%
rename from y2022/image_streamer/www_defaults/_stats.html
rename to frc971/image_streamer/www_defaults/_stats.html
diff --git a/y2022/image_streamer/www_defaults/favicon.ico b/frc971/image_streamer/www_defaults/favicon.ico
similarity index 100%
rename from y2022/image_streamer/www_defaults/favicon.ico
rename to frc971/image_streamer/www_defaults/favicon.ico
Binary files differ
diff --git a/y2022/BUILD b/y2022/BUILD
index 3d4dac3..a1ad250 100644
--- a/y2022/BUILD
+++ b/y2022/BUILD
@@ -44,17 +44,17 @@
"//y2022/localizer:imu_main",
"//y2022/localizer:localizer_main",
"//y2022/vision:image_decimator",
- "//y2022/image_streamer:image_streamer",
+ "//frc971/image_streamer:image_streamer",
"//aos/events/logging:log_cat",
],
data = [
":aos_config",
":message_bridge_client.sh",
- "//y2022/image_streamer:image_streamer_start",
+ "//y2022/vision:image_streamer_start",
],
dirs = [
"//y2022/www:www_files",
- "//y2022/image_streamer/www:www_files",
+ "//frc971/image_streamer/www:www_files",
],
start_binaries = [
"//aos/events/logging:logger_main",
diff --git a/y2022/vision/BUILD b/y2022/vision/BUILD
index 3d49755..31644e4 100644
--- a/y2022/vision/BUILD
+++ b/y2022/vision/BUILD
@@ -326,3 +326,9 @@
"//frc971/vision:vision_fbs",
],
)
+
+filegroup(
+ name = "image_streamer_start",
+ srcs = ["image_streamer_start.sh"],
+ visibility = ["//visibility:public"],
+)
diff --git a/y2022/image_streamer/image_streamer_start.sh b/y2022/vision/image_streamer_start.sh
similarity index 100%
rename from y2022/image_streamer/image_streamer_start.sh
rename to y2022/vision/image_streamer_start.sh
