Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
34ec89c0414c12cd14f4a4fc0749ea40a858948c
allwpilib/cscore/src/main/native/cpp/MjpegServerImpl.cpp

1057 lines
33 KiB
C++
Raw Normal View History

Remove year from file copyright message (NFC) (#2972) Also update copyright to include "and other WPILib contributors" and clarify license referral language to not be restricted to FIRST teams.
2020-12-26 14:12:05 -08:00
// Copyright (c) FIRST and other WPILib contributors.
// 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.
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
#include "MjpegServerImpl.h"
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
#include <chrono>
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
#include <fmt/format.h>
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
#include <wpi/SmallString.h>
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
#include <wpi/StringExtras.h>
#include <wpi/fmt/raw_ostream.h>
[wpinet] Move network portions of wpiutil into new wpinet library (#4077)
2022-05-07 10:54:14 -07:00
#include <wpinet/HttpUtil.h>
#include <wpinet/TCPAcceptor.h>
#include <wpinet/raw_socket_istream.h>
#include <wpinet/raw_socket_ostream.h>
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
#include "Handle.h"
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
#include "Instance.h"
Refactor JPEG functions to JpegUtil.
2016-12-02 23:33:29 -08:00
#include "JpegUtil.h"
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
#include "Log.h"
Notify on source and sink create and destroy.
2016-11-18 08:49:20 -08:00
#include "Notifier.h"
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
#include "SourceImpl.h"
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
#include "c_util.h"
#include "cscore_cpp.h"
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
using namespace cs;
// The boundary used for the M-JPEG stream.
// It separates the multipart stream of pictures
#define BOUNDARY "boundarydonotcross"
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
// A bare-bones HTML webpage for user friendliness.
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
static const char* emptyRootPage =
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
"</head><body>"
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
"<img src=\"/stream.mjpg\" /><p />"
"<a href=\"/settings.json\">Settings JSON</a>"
"</body></html>";
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
// An HTML page to be sent when a source exists
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
static const char* startRootPage =
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
"<script>\n"
"function httpGetAsync(name, val)\n"
"{\n"
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
" var host = location.protocol + '//' + location.host + "
"'/?action=command&' + name + '=' + val;\n"
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
" var xmlHttp = new XMLHttpRequest();\n"
" xmlHttp.open(\"GET\", host, true);\n"
" xmlHttp.send(null);\n"
"}\n"
"function updateInt(prop, name, val) {\n"
" document.querySelector(prop).value = val;\n"
" httpGetAsync(name, val);\n"
"}\n"
"function update(name, val) {\n"
" httpGetAsync(name, val);\n"
"}\n"
"</script>\n"
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
"<style>\n"
"table, th, td {\n"
" border: 1px solid black;\n"
" border-collapse: collapse;\n"
"}\n"
MjpegServer: style fixes for root page (#72) - Moves stream to the right of any settings - When the page is too small, then the stream will move to the top of the settings
2017-04-30 11:49:21 -04:00
".settings { float: left; }\n"
".stream { display: inline-block; margin-left: 10px; }\n"
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
"</style>\n"
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
"</head><body>\n"
MjpegServer: style fixes for root page (#72) - Moves stream to the right of any settings - When the page is too small, then the stream will move to the top of the settings
2017-04-30 11:49:21 -04:00
"<div class=\"stream\">\n"
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
"<img src=\"/stream.mjpg\" /><p />\n"
cscore: Add JSON for source settings (#1423) This allows save and restore of camera settings. The restore is a bit smarter than the save. * Fix mime types in mjpeg server * wpiutil: WPI_LOG: Make sure level is an unsigned int
2018-11-10 20:30:02 -08:00
"<a href=\"/settings.json\">Settings JSON</a> |\n"
"<a href=\"/config.json\">Source Config JSON</a>\n"
MjpegServer: style fixes for root page (#72) - Moves stream to the right of any settings - When the page is too small, then the stream will move to the top of the settings
2017-04-30 11:49:21 -04:00
"</div>\n"
"<div class=\"settings\">\n";
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
static const char* endRootPage = "</div></body></html>";
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
class MjpegServerImpl::ConnThread : public wpi::SafeThread {
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
public:
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
explicit ConnThread(std::string_view name, wpi::Logger& logger)
: m_name(name), m_logger(logger) {}
Improve logging consistency by using source/sink name throughout.
2016-12-10 23:36:35 -08:00
clang-tidy: modernize-use-override (NFC) Add NOLINT to CommandTestBase due to gmock not adding "override" keyword, which causes warnings on clang.
2020-12-28 00:10:13 -08:00
void Main() override;
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
bool ProcessCommand(wpi::raw_ostream& os, SourceImpl& source,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view parameters, bool respond);
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
void SendJSON(wpi::raw_ostream& os, SourceImpl& source, bool header);
void SendHTMLHeadTitle(wpi::raw_ostream& os) const;
void SendHTML(wpi::raw_ostream& os, SourceImpl& source, bool header);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
void SendStream(wpi::raw_socket_ostream& os);
void ProcessRequest();
std::unique_ptr<wpi::NetworkStream> m_stream;
std::shared_ptr<SourceImpl> m_source;
bool m_streaming = false;
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
bool m_noStreaming = false;
MjpegServer: Add ability to set compression, etc in code (#1229) This allows code to set the stream compression, resolution, and FPS used if not specified in HTTP parameters by the client.
2018-07-27 23:00:15 -07:00
int m_width = 0;
int m_height = 0;
int m_compression = -1;
int m_defaultCompression = 80;
int m_fps = 0;
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
private:
Improve logging consistency by using source/sink name throughout.
2016-12-10 23:36:35 -08:00
std::string m_name;
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
wpi::Logger& m_logger;
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view GetName() { return m_name; }
Improve logging consistency by using source/sink name throughout.
2016-12-10 23:36:35 -08:00
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
std::shared_ptr<SourceImpl> GetSource() {
Replace std::lock_guard and std::lock with std::scoped_lock (#1758) std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
2019-07-08 22:58:39 -07:00
std::scoped_lock lock(m_mutex);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
return m_source;
}
void StartStream() {
Replace std::lock_guard and std::lock with std::scoped_lock (#1758) std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
2019-07-08 22:58:39 -07:00
std::scoped_lock lock(m_mutex);
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (m_source) {
m_source->EnableSink();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
m_streaming = true;
}
void StopStream() {
Replace std::lock_guard and std::lock with std::scoped_lock (#1758) std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
2019-07-08 22:58:39 -07:00
std::scoped_lock lock(m_mutex);
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (m_source) {
m_source->DisableSink();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
m_streaming = false;
}
};
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Standard header to send along with other header information like mimetype.
//
// The parameters should ensure the browser does not cache our answer.
// A browser should connect for each file and not serve files from its cache.
// Using cached pictures would lead to showing old/outdated pictures.
// Many browsers seem to ignore, or at least not always obey, those headers.
cscore: Use Twine instead of StringRef in API (#1244)
2018-07-29 12:53:41 -07:00
static void SendHeader(wpi::raw_ostream& os, int code,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view codeText, std::string_view contentType,
std::string_view extra = {}) {
fmt::print(os, "HTTP/1.0 {} {}\r\n", code, codeText);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << "Connection: close\r\n"
"Server: CameraServer/1.0\r\n"
"Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, "
"post-check=0, max-age=0\r\n"
"Pragma: no-cache\r\n"
"Expires: Mon, 3 Jan 2000 12:34:56 GMT\r\n";
os << "Content-Type: " << contentType << "\r\n";
Fix CORS issue with all requests (#85) Closes #84.
2017-08-07 17:46:33 -07:00
os << "Access-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: *\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (!extra.empty()) {
os << extra << "\r\n";
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << "\r\n"; // header ends with a blank line
}
// Send error header and message
// @param code HTTP error code (e.g. 404)
// @param message Additional message text
cscore: Use Twine instead of StringRef in API (#1244)
2018-07-29 12:53:41 -07:00
static void SendError(wpi::raw_ostream& os, int code,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view message) {
std::string_view codeText, extra, baseMessage;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
switch (code) {
case 401:
codeText = "Unauthorized";
extra = "WWW-Authenticate: Basic realm=\"CameraServer\"";
baseMessage = "401: Not Authenticated!";
break;
case 404:
codeText = "Not Found";
baseMessage = "404: Not Found!";
break;
case 500:
codeText = "Internal Server Error";
baseMessage = "500: Internal Server Error!";
break;
case 400:
codeText = "Bad Request";
baseMessage = "400: Not Found!";
break;
case 403:
codeText = "Forbidden";
baseMessage = "403: Forbidden!";
break;
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
case 503:
codeText = "Service Unavailable";
baseMessage = "503: Service Unavailable";
break;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
default:
code = 501;
codeText = "Not Implemented";
baseMessage = "501: Not Implemented!";
break;
}
SendHeader(os, code, codeText, "text/plain", extra);
os << baseMessage << "\r\n" << message;
}
// Perform a command specified by HTTP GET parameters.
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
bool MjpegServerImpl::ConnThread::ProcessCommand(wpi::raw_ostream& os,
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
SourceImpl& source,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view parameters,
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
bool respond) {
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<256> responseBuf;
wpi::raw_svector_ostream response{responseBuf};
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// command format: param1=value1&param2=value2...
while (!parameters.empty()) {
// split out next param and value
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view rawParam, rawValue;
std::tie(rawParam, parameters) = wpi::split(parameters, '&');
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (rawParam.empty()) {
continue; // ignore "&&"
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::tie(rawParam, rawValue) = wpi::split(rawParam, '=');
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (rawParam.empty() || rawValue.empty()) {
continue; // ignore "param="
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG4("HTTP parameter \"{}\" value \"{}\"", rawParam, rawValue);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// unescape param
Refactor HTTP utilities.
2016-12-02 19:15:40 -08:00
bool error = false;
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<64> paramBuf;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view param = wpi::UnescapeURI(rawParam, paramBuf, &error);
Refactor HTTP utilities.
2016-12-02 19:15:40 -08:00
if (error) {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
auto estr = fmt::format("could not unescape parameter \"{}\"", rawParam);
SendError(os, 500, estr);
SDEBUG("{}", estr);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
return false;
}
// unescape value
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<64> valueBuf;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view value = wpi::UnescapeURI(rawValue, valueBuf, &error);
Refactor HTTP utilities.
2016-12-02 19:15:40 -08:00
if (error) {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
auto estr = fmt::format("could not unescape value \"{}\"", rawValue);
SendError(os, 500, estr);
SDEBUG("{}", estr);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
return false;
}
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
// Handle resolution, compression, and FPS. These are handled locally
// rather than passed to the source.
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
if (param == "resolution") {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
auto [widthStr, heightStr] = wpi::split(value, 'x');
int width = wpi::parse_integer<int>(widthStr, 10).value_or(-1);
int height = wpi::parse_integer<int>(heightStr, 10).value_or(-1);
if (width < 0) {
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
response << param << ": \"width is not an integer\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SWARNING("HTTP parameter \"{}\" width \"{}\" is not an integer", param,
widthStr);
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
continue;
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (height < 0) {
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
response << param << ": \"height is not an integer\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SWARNING("HTTP parameter \"{}\" height \"{}\" is not an integer", param,
heightStr);
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
continue;
}
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
m_width = width;
m_height = height;
response << param << ": \"ok\"\r\n";
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
continue;
}
if (param == "fps") {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (auto v = wpi::parse_integer<int>(value, 10)) {
m_fps = v.value();
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
response << param << ": \"ok\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else {
response << param << ": \"invalid integer\"\r\n";
SWARNING("HTTP parameter \"{}\" value \"{}\" is not an integer", param,
value);
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
}
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
continue;
}
if (param == "compression") {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (auto v = wpi::parse_integer<int>(value, 10)) {
m_compression = v.value();
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
response << param << ": \"ok\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else {
response << param << ": \"invalid integer\"\r\n";
SWARNING("HTTP parameter \"{}\" value \"{}\" is not an integer", param,
value);
MJPEGServer: Pass resolution and FPS requests to source.
2016-10-17 20:16:49 -07:00
}
continue;
}
MJPEGServer: Make a couple of tweaks for Axis camera compatibility.
2016-11-18 18:33:49 -08:00
// ignore name parameter
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (param == "name") {
continue;
}
MJPEGServer: Make a couple of tweaks for Axis camera compatibility.
2016-11-18 18:33:49 -08:00
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// try to assign parameter
HTTPSink: Add basic property setting support.
2016-09-20 23:27:21 -07:00
auto prop = source.GetPropertyIndex(param);
if (!prop) {
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
response << param << ": \"ignored\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SWARNING("ignoring HTTP parameter \"{}\"", param);
HTTPSink: Add basic property setting support.
2016-09-20 23:27:21 -07:00
continue;
}
CS_Status status = 0;
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
auto kind = source.GetPropertyKind(prop);
switch (kind) {
HTTPSink: Add basic property setting support.
2016-09-20 23:27:21 -07:00
case CS_PROP_BOOLEAN:
case CS_PROP_INTEGER:
case CS_PROP_ENUM: {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (auto v = wpi::parse_integer<int>(value, 10)) {
fmt::print(response, "{}: {}\r\n", param, v.value());
SDEBUG4("HTTP parameter \"{}\" value {}", param, value);
source.SetProperty(prop, v.value(), &status);
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
} else {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
response << param << ": \"invalid integer\"\r\n";
SWARNING("HTTP parameter \"{}\" value \"{}\" is not an integer",
param, value);
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
}
HTTPSink: Add basic property setting support.
2016-09-20 23:27:21 -07:00
break;
}
case CS_PROP_STRING: {
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
response << param << ": \"ok\"\r\n";
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG4("HTTP parameter \"{}\" value \"{}\"", param, value);
HTTPSink: Add basic property setting support.
2016-09-20 23:27:21 -07:00
source.SetStringProperty(prop, value, &status);
break;
}
default:
break;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
// Send HTTP response
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
if (respond) {
SendHeader(os, 200, "OK", "text/plain");
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
os << response.str() << "\r\n";
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
return true;
}
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
void MjpegServerImpl::ConnThread::SendHTMLHeadTitle(
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::raw_ostream& os) const {
cscore: set charset of displayed pages (#1520) All of our strings are UTF-8, but the default charset for HTML<5 was ISO-8859-1
2018-12-31 02:49:24 -05:00
os << "<html><head><title>" << m_name << " CameraServer</title>"
<< "<meta charset=\"UTF-8\">";
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
}
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
// Send the root html file with controls for all the settable properties.
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
void MjpegServerImpl::ConnThread::SendHTML(wpi::raw_ostream& os,
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
SourceImpl& source, bool header) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (header) {
SendHeader(os, 200, "OK", "text/html");
}
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
SendHTMLHeadTitle(os);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
os << startRootPage;
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallVector<int, 32> properties_vec;
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
CS_Status status = 0;
for (auto prop : source.EnumerateProperties(properties_vec, &status)) {
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> name_buf;
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
auto name = source.GetPropertyName(prop, name_buf, &status);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (wpi::starts_with(name, "raw_")) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
continue;
}
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
auto kind = source.GetPropertyKind(prop);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "<p /><label for=\"{0}\">{0}</label>\n", name);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
switch (kind) {
case CS_PROP_BOOLEAN:
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os,
"<input id=\"{0}\" type=\"checkbox\" "
"onclick=\"update('{0}', this.checked ? 1 : 0)\" ",
name);
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (source.GetProperty(prop, &status) != 0) {
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
os << "checked />\n";
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
} else {
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
os << " />\n";
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
break;
case CS_PROP_INTEGER: {
auto valI = source.GetProperty(prop, &status);
auto min = source.GetPropertyMin(prop, &status);
auto max = source.GetPropertyMax(prop, &status);
auto step = source.GetPropertyStep(prop, &status);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os,
"<input type=\"range\" min=\"{1}\" max=\"{2}\" "
"value=\"{3}\" id=\"{0}\" step=\"{4}\" "
"oninput=\"updateInt('#{0}op', '{0}', value)\" />\n",
name, min, max, valI, step);
fmt::print(os, "<output for=\"{0}\" id=\"{0}op\">{1}</output>\n", name,
valI);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
break;
}
case CS_PROP_ENUM: {
auto valE = source.GetProperty(prop, &status);
auto choices = source.GetEnumPropertyChoices(prop, &status);
int j = 0;
for (auto choice = choices.begin(), end = choices.end(); choice != end;
++j, ++choice) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (choice->empty()) {
continue; // skip empty choices
}
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
// replace any non-printable characters in name with spaces
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> ch_name;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
for (char ch : *choice) {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
ch_name.push_back(wpi::isPrint(ch) ? ch : ' ');
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os,
"<input id=\"{0}{1}\" type=\"radio\" name=\"{0}\" "
"value=\"{2}\" onclick=\"update('{0}', {1})\"",
name, j, ch_name);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
if (j == valE) {
os << " checked";
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, " /><label for=\"{}{}\">{}</label>\n", name, j,
ch_name);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
}
break;
}
case CS_PROP_STRING: {
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> strval_buf;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os,
"<input type=\"text\" id=\"{0}box\" name=\"{0}\" "
"value=\"{1}\" />\n",
name, source.GetStringProperty(prop, strval_buf, &status));
fmt::print(os,
"<input type=\"button\" value =\"Submit\" "
"onclick=\"update('{0}', {0}box.value)\" />\n",
name);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
break;
}
default:
break;
}
}
Provide alternate device paths info for USB cameras (#1519) This is primarily for use on Linux to get by-id or by-path device names. This information is now part of UsbCameraInfo. A new entry point was added to UsbCamera to get that camera's UsbCameraInfo. The alternate paths are also returned in EnumerateUsbCameras.
2018-12-30 11:48:18 -08:00
status = 0;
auto info = GetUsbCameraInfo(Instance::GetInstance().FindSource(source).first,
&status);
if (status == CS_OK) {
os << "<p>USB device path: " << info.path << '\n';
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
for (auto&& path : info.otherPaths) {
Provide alternate device paths info for USB cameras (#1519) This is primarily for use on Linux to get by-id or by-path device names. This information is now part of UsbCameraInfo. A new entry point was added to UsbCamera to get that camera's UsbCameraInfo. The alternate paths are also returned in EnumerateUsbCameras.
2018-12-30 11:48:18 -08:00
os << "<p>Alternate device path: " << path << '\n';
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Provide alternate device paths info for USB cameras (#1519) This is primarily for use on Linux to get by-id or by-path device names. This information is now part of UsbCameraInfo. A new entry point was added to UsbCamera to get that camera's UsbCameraInfo. The alternate paths are also returned in EnumerateUsbCameras.
2018-12-30 11:48:18 -08:00
}
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << "<p>Supported Video Modes:</p>\n";
os << "<table cols=\"4\" style=\"border: 1px solid black\">\n";
os << "<tr><th>Pixel Format</th>"
<< "<th>Width</th>"
<< "<th>Height</th>"
<< "<th>FPS</th></tr>";
for (auto mode : source.EnumerateVideoModes(&status)) {
os << "<tr><td>";
switch (mode.pixelFormat) {
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
case VideoMode::kMJPEG:
os << "MJPEG";
break;
case VideoMode::kYUYV:
os << "YUYV";
break;
case VideoMode::kRGB565:
os << "RGB565";
break;
case VideoMode::kBGR:
os << "BGR";
break;
case VideoMode::kGray:
os << "gray";
break;
[cscore] Add UYVY image support (#4700)
2022-11-23 22:00:31 -08:00
case VideoMode::kUYVY:
os << "UYVY";
break;
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
default:
os << "unknown";
break;
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "</td><td>{}</td><td>{}</td><td>{}</td></tr>", mode.width,
mode.height, mode.fps);
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
}
os << "</table>\n";
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
os << endRootPage << "\r\n";
os.flush();
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Send a JSON file which is contains information about the source parameters.
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
void MjpegServerImpl::ConnThread::SendJSON(wpi::raw_ostream& os,
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
SourceImpl& source, bool header) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (header) {
SendHeader(os, 200, "OK", "application/json");
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << "{\n\"controls\": [\n";
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallVector<int, 32> properties_vec;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
bool first = true;
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
CS_Status status = 0;
for (auto prop : source.EnumerateProperties(properties_vec, &status)) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (first) {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
first = false;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
} else {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << ",\n";
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << '{';
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> name_buf;
HTTPSinkImpl fixes.
2016-09-20 20:40:58 -07:00
auto name = source.GetPropertyName(prop, name_buf, &status);
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
auto kind = source.GetPropertyKind(prop);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "\n\"name\": \"{}\"", name);
fmt::print(os, ",\n\"id\": \"{}\"", prop);
[wpiutil] Upgrade to fmt 9.0.0 (#4337) fmt removed fmt::make_args_checked since it's no longer needed for constexpr format string checks. fmt deprecated implicit conversions from enums to integers in format arguments, so I added explicit static casts.
2022-08-16 15:35:26 -07:00
fmt::print(os, ",\n\"type\": \"{}\"", static_cast<int>(kind));
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, ",\n\"min\": \"{}\"", source.GetPropertyMin(prop, &status));
fmt::print(os, ",\n\"max\": \"{}\"", source.GetPropertyMax(prop, &status));
fmt::print(os, ",\n\"step\": \"{}\"",
source.GetPropertyStep(prop, &status));
fmt::print(os, ",\n\"default\": \"{}\"",
source.GetPropertyDefault(prop, &status));
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << ",\n\"value\": \"";
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
switch (kind) {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
case CS_PROP_BOOLEAN:
Collapse boolean/double/enum properties into just integer.
2016-09-20 22:17:12 -07:00
case CS_PROP_INTEGER:
case CS_PROP_ENUM:
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "{}", source.GetProperty(prop, &status));
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
break;
case CS_PROP_STRING: {
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> strval_buf;
HTTPSinkImpl fixes.
2016-09-20 20:40:58 -07:00
os << source.GetStringProperty(prop, strval_buf, &status);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
break;
}
default:
break;
}
os << '"';
HTTPSinkImpl fixes.
2016-09-20 20:40:58 -07:00
// os << ",\n\"dest\": \"0\"";
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// os << ",\n\"flags\": \"" << param->flags << '"';
// os << ",\n\"group\": \"" << param->group << '"';
// append the menu object to the menu typecontrols
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
if (source.GetPropertyKind(prop) == CS_PROP_ENUM) {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << ",\n\"menu\": {";
Add status parameter to property functions.
2016-09-19 23:50:47 -07:00
auto choices = source.GetEnumPropertyChoices(prop, &status);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
int j = 0;
for (auto choice = choices.begin(), end = choices.end(); choice != end;
++j, ++choice) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (j != 0) {
os << ", ";
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// replace any non-printable characters in name with spaces
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> ch_name;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
for (char ch : *choice) {
ch_name.push_back(std::isprint(ch) ? ch : ' ');
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "\"{}\": \"{}\"", j, ch_name);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
os << "}\n";
}
os << '}';
}
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << "\n],\n\"modes\": [\n";
first = true;
for (auto mode : source.EnumerateVideoModes(&status)) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (first) {
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
first = false;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
} else {
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << ",\n";
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << '{';
os << "\n\"pixelFormat\": \"";
switch (mode.pixelFormat) {
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
case VideoMode::kMJPEG:
os << "MJPEG";
break;
case VideoMode::kYUYV:
os << "YUYV";
break;
case VideoMode::kRGB565:
os << "RGB565";
break;
case VideoMode::kBGR:
os << "BGR";
break;
case VideoMode::kGray:
os << "gray";
break;
[cscore] Add UYVY image support (#4700)
2022-11-23 22:00:31 -08:00
case VideoMode::kUYVY:
os << "UYVY";
break;
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
default:
os << "unknown";
break;
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
fmt::print(os, "\",\n\"width\": \"{}\"", mode.width);
fmt::print(os, ",\n\"height\": \"{}\"", mode.height);
fmt::print(os, ",\n\"fps\": \"{}\"", mode.fps);
Publish video modes to webserver. (#58) This puts a table of modes onto the main webpage and also adds them to the JSON output. Fixes #50.
2017-02-16 01:06:38 -08:00
os << '}';
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << "\n]\n}\n";
os.flush();
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
MjpegServerImpl::MjpegServerImpl(std::string_view name, wpi::Logger& logger,
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
Notifier& notifier, Telemetry& telemetry,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view listenAddress, int port,
Rename HTTPSink to MJPEGServer.
2016-10-15 22:44:26 -07:00
std::unique_ptr<wpi::NetworkAcceptor> acceptor)
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
: SinkImpl{name, logger, notifier, telemetry},
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
m_listenAddress(listenAddress),
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
m_port(port),
m_acceptor{std::move(acceptor)} {
HTTPSinkImpl fixes.
2016-09-20 20:40:58 -07:00
m_active = true;
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SetDescription(fmt::format("HTTP Server on port {}", port));
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
MjpegServer: Add ability to set compression, etc in code (#1229) This allows code to set the stream compression, resolution, and FPS used if not specified in HTTP parameters by the client.
2018-07-27 23:00:15 -07:00
// Create properties
m_widthProp = CreateProperty("width", [] {
return std::make_unique<PropertyImpl>("width", CS_PROP_INTEGER, 1, 0, 0);
});
m_heightProp = CreateProperty("height", [] {
return std::make_unique<PropertyImpl>("height", CS_PROP_INTEGER, 1, 0, 0);
});
m_compressionProp = CreateProperty("compression", [] {
return std::make_unique<PropertyImpl>("compression", CS_PROP_INTEGER, -1,
100, 1, -1, -1);
});
m_defaultCompressionProp = CreateProperty("default_compression", [] {
return std::make_unique<PropertyImpl>("default_compression",
CS_PROP_INTEGER, 0, 100, 1, 80, 80);
});
m_fpsProp = CreateProperty("fps", [] {
return std::make_unique<PropertyImpl>("fps", CS_PROP_INTEGER, 1, 0, 0);
});
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
m_serverThread = std::thread(&MjpegServerImpl::ServerThreadMain, this);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
MjpegServerImpl::~MjpegServerImpl() {
Stop();
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::Stop() {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
m_active = false;
// wake up server thread by shutting down the socket
m_acceptor->shutdown();
// join server thread
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (m_serverThread.joinable()) {
m_serverThread.join();
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// close streams
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
for (auto& connThread : m_connThreads) {
if (auto thr = connThread.GetThread()) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (thr->m_stream) {
thr->m_stream->close();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
}
connThread.Stop();
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// wake up connection threads by forcing an empty frame to be sent
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (auto source = GetSource()) {
source->Wakeup();
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
// Send HTTP response and a stream of JPG-frames
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::ConnThread::SendStream(wpi::raw_socket_ostream& os) {
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
if (m_noStreaming) {
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SERROR("Too many simultaneous client streams");
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
SendError(os, 503, "Too many simultaneous streams");
return;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os.SetUnbuffered();
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<256> header;
wpi::raw_svector_ostream oss{header};
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
Fix CORS issue with all requests (#85) Closes #84.
2017-08-07 17:46:33 -07:00
SendHeader(oss, 200, "OK", "multipart/x-mixed-replace;boundary=" BOUNDARY);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << oss.str();
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("Headers send, sending stream now");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
MjpegServer: Support limiting FPS. (#123)
2018-03-01 20:00:25 -08:00
Frame::Time lastFrameTime = 0;
Frame::Time timePerFrame = 0;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (m_fps != 0) {
timePerFrame = 1000000.0 / m_fps;
}
cscore: MjpegServer: Fix FPS limiting (#1536) This uses a 1-second window average to try to hit the desired FPS.
2019-01-09 22:50:34 -08:00
Frame::Time averageFrameTime = 0;
Frame::Time averagePeriod = 1000000; // 1 second window
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (averagePeriod < timePerFrame) {
averagePeriod = timePerFrame * 10;
}
MjpegServer: Support limiting FPS. (#123)
2018-03-01 20:00:25 -08:00
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
StartStream();
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
while (m_active && !os.has_error()) {
auto source = GetSource();
if (!source) {
Add GetNextFrame timeout to CvSink and MjpegServer. MjpegServer uses the timeout to generate keep-alives to any clients (which helps detect disconnects and avoid stale client threads). CvSink GrabFrame now defaults to a timeout, but the timeout can be changed by the user, or the old no-timeout version is now available as GrabFrameNoTimeout.
2017-02-17 01:17:12 -08:00
// Source disconnected; sleep so we don't consume all processor time.
os << "\r\n"; // Keep connection alive
std::this_thread::sleep_for(std::chrono::milliseconds(200));
Fix SendStream error handling.
2016-09-08 21:00:23 -07:00
continue;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG4("waiting for frame");
Add GetNextFrame timeout to CvSink and MjpegServer. MjpegServer uses the timeout to generate keep-alives to any clients (which helps detect disconnects and avoid stale client threads). CvSink GrabFrame now defaults to a timeout, but the timeout can be changed by the user, or the old no-timeout version is now available as GrabFrameNoTimeout.
2017-02-17 01:17:12 -08:00
Frame frame = source->GetNextFrame(0.225); // blocks
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (!m_active) {
break;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
if (!frame) {
MjpegServer: Increase bad frame wait from 10 to 20 ms.
2016-12-02 23:41:35 -08:00
// Bad frame; sleep for 20 ms so we don't consume all processor time.
Add GetNextFrame timeout to CvSink and MjpegServer. MjpegServer uses the timeout to generate keep-alives to any clients (which helps detect disconnects and avoid stale client threads). CvSink GrabFrame now defaults to a timeout, but the timeout can be changed by the user, or the old no-timeout version is now available as GrabFrameNoTimeout.
2017-02-17 01:17:12 -08:00
os << "\r\n"; // Keep connection alive
MjpegServer: Increase bad frame wait from 10 to 20 ms.
2016-12-02 23:41:35 -08:00
std::this_thread::sleep_for(std::chrono::milliseconds(20));
Fix SendStream error handling.
2016-09-08 21:00:23 -07:00
continue;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Start adding support for non-MJPEG frame types. Not yet supported by MJPEGServer.
2016-11-10 00:00:20 -08:00
cscore: MjpegServer: Fix FPS limiting (#1536) This uses a 1-second window average to try to hit the desired FPS.
2019-01-09 22:50:34 -08:00
auto thisFrameTime = frame.GetTime();
if (thisFrameTime != 0 && timePerFrame != 0 && lastFrameTime != 0) {
Frame::Time deltaTime = thisFrameTime - lastFrameTime;
// drop frame if it is early compared to the desired frame rate AND
// the current average is higher than the desired average
if (deltaTime < timePerFrame && averageFrameTime < timePerFrame) {
// sleep for 1 ms so we don't consume all processor time
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
}
// update average
if (averageFrameTime != 0) {
averageFrameTime =
averageFrameTime * (averagePeriod - timePerFrame) / averagePeriod +
deltaTime * timePerFrame / averagePeriod;
} else {
averageFrameTime = deltaTime;
}
MjpegServer: Support limiting FPS. (#123)
2018-03-01 20:00:25 -08:00
}
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
int width = m_width != 0 ? m_width : frame.GetOriginalWidth();
int height = m_height != 0 ? m_height : frame.GetOriginalHeight();
cscore: Support multiple levels of JPEG compression (#1223) This allows two streams with different compression levels, and also allows a stream to receive a different compression level than provided by a JPEG camera (decompress and recompress).
2018-07-27 21:51:40 -07:00
Image* image = frame.GetImageMJPEG(
MjpegServer: Add ability to set compression, etc in code (#1229) This allows code to set the stream compression, resolution, and FPS used if not specified in HTTP parameters by the client.
2018-07-27 23:00:15 -07:00
width, height, m_compression,
m_compression == -1 ? m_defaultCompression : m_compression);
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
if (!image) {
// Shouldn't happen, but just in case...
std::this_thread::sleep_for(std::chrono::milliseconds(20));
continue;
}
const char* data = image->data();
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
size_t size = image->size();
Move MJPEG DHT insertion from SourceImpl to MJPEGServerImpl. OpenCV imdecode supports images with no DHT, so it's not necessary to add it on the source side.
2016-11-11 23:17:39 -08:00
bool addDHT = false;
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
size_t locSOF = size;
Support per-stream resolution settings. The code now automatically resizes as required. This change also disconnects camera resolution settings from MJPEG stream connections; setting the camera resolution can now only be done via code.
2016-12-20 20:48:31 -08:00
switch (image->pixelFormat) {
Start adding support for non-MJPEG frame types. Not yet supported by MJPEGServer.
2016-11-10 00:00:20 -08:00
case VideoMode::kMJPEG:
Move MJPEG DHT insertion from SourceImpl to MJPEGServerImpl. OpenCV imdecode supports images with no DHT, so it's not necessary to add it on the source side.
2016-11-11 23:17:39 -08:00
// Determine if we need to add DHT to it, and allocate enough space
// for adding it if required.
Refactor JPEG functions to JpegUtil.
2016-12-02 23:33:29 -08:00
addDHT = JpegNeedsDHT(data, &size, &locSOF);
Start adding support for non-MJPEG frame types. Not yet supported by MJPEGServer.
2016-11-10 00:00:20 -08:00
break;
[cscore] Add UYVY image support (#4700)
2022-11-23 22:00:31 -08:00
case VideoMode::kUYVY:
Start adding support for non-MJPEG frame types. Not yet supported by MJPEGServer.
2016-11-10 00:00:20 -08:00
case VideoMode::kRGB565:
[cscore] Add UYVY image support (#4700)
2022-11-23 22:00:31 -08:00
case VideoMode::kYUYV:
Start adding support for non-MJPEG frame types. Not yet supported by MJPEGServer.
2016-11-10 00:00:20 -08:00
default:
// Bad frame; sleep for 10 ms so we don't consume all processor time.
std::this_thread::sleep_for(std::chrono::milliseconds(10));
continue;
}
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG4("sending frame size={} addDHT={}", size, addDHT);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// print the individual mimetype and the length
// sending the content-length fixes random stream disruption observed
// with firefox
cscore: MjpegServer: Fix FPS limiting (#1536) This uses a 1-second window average to try to hit the desired FPS.
2019-01-09 22:50:34 -08:00
lastFrameTime = thisFrameTime;
MjpegServer: Support limiting FPS. (#123)
2018-03-01 20:00:25 -08:00
double timestamp = lastFrameTime / 1000000.0;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
header.clear();
Revert "Don't output \r\n before boundary. This throws off some clients." This reverts commit ae8c8ec2304d6d280d1ec65858d46db329cb0c14.
2016-11-30 21:50:15 -08:00
oss << "\r\n--" BOUNDARY "\r\n"
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
<< "Content-Type: image/jpeg\r\n";
fmt::print(oss, "Content-Length: {}\r\n", size);
fmt::print(oss, "X-Timestamp: {}\r\n", timestamp);
oss << "\r\n";
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
os << oss.str();
Move MJPEG DHT insertion from SourceImpl to MJPEGServerImpl. OpenCV imdecode supports images with no DHT, so it's not necessary to add it on the source side.
2016-11-11 23:17:39 -08:00
if (addDHT) {
// Insert DHT data immediately before SOF
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
os << std::string_view(data, locSOF);
Refactor JPEG functions to JpegUtil.
2016-12-02 23:33:29 -08:00
os << JpegGetDHT();
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
os << std::string_view(data + locSOF, image->size() - locSOF);
Move MJPEG DHT insertion from SourceImpl to MJPEGServerImpl. OpenCV imdecode supports images with no DHT, so it's not necessary to add it on the source side.
2016-11-11 23:17:39 -08:00
} else {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
os << std::string_view(data, size);
Move MJPEG DHT insertion from SourceImpl to MJPEGServerImpl. OpenCV imdecode supports images with no DHT, so it's not necessary to add it on the source side.
2016-11-11 23:17:39 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// os.flush();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
StopStream();
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::ConnThread::ProcessRequest() {
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
wpi::raw_socket_istream is{*m_stream};
wpi::raw_socket_ostream os{*m_stream, true};
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Read the request string from the stream
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> reqBuf;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view req = is.getline(reqBuf, 4096);
HttpUtil has moved to wpiutil; use it. (#92)
2017-08-25 18:10:47 -07:00
if (is.has_error()) {
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("error getting request string");
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
return;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
cscore: Add JSON for source settings (#1423) This allows save and restore of camera settings. The restore is a bit smarter than the save. * Fix mime types in mjpeg server * wpiutil: WPI_LOG: Make sure level is an unsigned int
2018-11-10 20:30:02 -08:00
enum { kCommand, kStream, kGetSettings, kGetSourceConfig, kRootPage } kind;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::string_view parameters;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
size_t pos;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG("HTTP request: '{}'\n", req);
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
// Determine request kind. Most of these are for mjpgstreamer
MJPEGServer: Make a couple of tweaks for Axis camera compatibility.
2016-11-18 18:33:49 -08:00
// compatibility, others are for Axis camera compatibility.
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if ((pos = req.find("POST /stream")) != std::string_view::npos) {
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
kind = kStream;
[wpiutil] StringExtras: Add substr() (#3742) Unlike std::string and std::string_view, this substr() allows a start greater than the length of the string, in which case an empty string is returned. This matches llvm::StringRef behavior.
2021-11-27 21:31:40 -08:00
parameters = wpi::substr(wpi::substr(req, req.find('?', pos + 12)), 1);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if ((pos = req.find("GET /?action=stream")) !=
std::string_view::npos) {
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
kind = kStream;
[wpiutil] StringExtras: Add substr() (#3742) Unlike std::string and std::string_view, this substr() allows a start greater than the length of the string, in which case an empty string is returned. This matches llvm::StringRef behavior.
2021-11-27 21:31:40 -08:00
parameters = wpi::substr(wpi::substr(req, req.find('&', pos + 19)), 1);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if ((pos = req.find("GET /stream.mjpg")) != std::string_view::npos) {
MJPEGServer: Make a couple of tweaks for Axis camera compatibility.
2016-11-18 18:33:49 -08:00
kind = kStream;
[wpiutil] StringExtras: Add substr() (#3742) Unlike std::string and std::string_view, this substr() allows a start greater than the length of the string, in which case an empty string is returned. This matches llvm::StringRef behavior.
2021-11-27 21:31:40 -08:00
parameters = wpi::substr(wpi::substr(req, req.find('?', pos + 16)), 1);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if (req.find("GET /settings") != std::string_view::npos &&
req.find(".json") != std::string_view::npos) {
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
kind = kGetSettings;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if (req.find("GET /config") != std::string_view::npos &&
req.find(".json") != std::string_view::npos) {
cscore: Add JSON for source settings (#1423) This allows save and restore of camera settings. The restore is a bit smarter than the save. * Fix mime types in mjpeg server * wpiutil: WPI_LOG: Make sure level is an unsigned int
2018-11-10 20:30:02 -08:00
kind = kGetSourceConfig;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if (req.find("GET /input") != std::string_view::npos &&
req.find(".json") != std::string_view::npos) {
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
kind = kGetSettings;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if (req.find("GET /output") != std::string_view::npos &&
req.find(".json") != std::string_view::npos) {
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
kind = kGetSettings;
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if ((pos = req.find("GET /?action=command")) !=
std::string_view::npos) {
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
kind = kCommand;
[wpiutil] StringExtras: Add substr() (#3742) Unlike std::string and std::string_view, this substr() allows a start greater than the length of the string, in which case an empty string is returned. This matches llvm::StringRef behavior.
2021-11-27 21:31:40 -08:00
parameters = wpi::substr(wpi::substr(req, req.find('&', pos + 20)), 1);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
} else if (req.find("GET / ") != std::string_view::npos || req == "GET /\n") {
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
kind = kRootPage;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
} else {
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("HTTP request resource not found");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
SendError(os, 404, "Resource not found");
return;
}
// Parameter can only be certain characters. This also strips the EOL.
pos = parameters.find_first_not_of(
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"
"-=&1234567890%./");
[wpiutil] StringExtras: Add substr() (#3742) Unlike std::string and std::string_view, this substr() allows a start greater than the length of the string, in which case an empty string is returned. This matches llvm::StringRef behavior.
2021-11-27 21:31:40 -08:00
parameters = wpi::substr(parameters, 0, pos);
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG("command parameters: \"{}\"", parameters);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Read the rest of the HTTP request.
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
// The end of the request is marked by a single, empty line
Move entirety of llvm namespace to wpi namespace. During shared library loading, a different libLLVM can be pulled in, causing llvm symbols from dependent libraries to resolve to that library instead of this one. This has been seen in the wild with the Mesa OpenGL implementation in JavaFX applications (see wpilibsuite/shuffleboard#361). This is clearly a very breaking change. For some level of backwards compatibility, a namespace alias from llvm to wpi is performed in the "llvm" headers. Unfortunately, forward declarations of llvm classes will still break, but compilers seem to generate clear error messages in those cases ("namespace alias 'llvm' not allowed here, assuming 'wpi'"). This change also moves all the wpiutil headers to a single "wpi" subdirectory from the previously split "llvm", "support", "tcpsockets", and "udpsockets". Shim headers will be added for backwards compatibility in a later commit.
2018-04-29 23:33:19 -07:00
wpi::SmallString<128> lineBuf;
Refactor HTTP utilities.
2016-12-02 19:15:40 -08:00
for (;;) {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
if (wpi::starts_with(is.getline(lineBuf, 4096), "\n")) {
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
break;
}
if (is.has_error()) {
return;
}
Refactor HTTP utilities.
2016-12-02 19:15:40 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Send response
Rename Type to Kind.
2016-11-15 23:54:50 -08:00
switch (kind) {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
case kStream:
if (auto source = GetSource()) {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG("request for stream {}", source->GetName());
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (!ProcessCommand(os, *source, parameters, false)) {
return;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
SendStream(os);
break;
case kCommand:
if (auto source = GetSource()) {
Finish most of USBCameraImpl. The main thing not yet fully implemented is video mode setting. Also fix a handful of bugs in HTTPSinkImpl.
2016-10-13 00:16:24 -07:00
ProcessCommand(os, *source, parameters, true);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
} else {
SendHeader(os, 200, "OK", "text/plain");
Set up wpiformat (#86)
2017-08-25 17:48:06 -07:00
os << "Ignored due to no connected source."
<< "\r\n";
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("Ignored due to no connected source.");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
break;
case kGetSettings:
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("request for JSON file");
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (auto source = GetSource()) {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
SendJSON(os, *source, true);
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
} else {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
SendError(os, 404, "Resource not found");
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
break;
cscore: Add JSON for source settings (#1423) This allows save and restore of camera settings. The restore is a bit smarter than the save. * Fix mime types in mjpeg server * wpiutil: WPI_LOG: Make sure level is an unsigned int
2018-11-10 20:30:02 -08:00
case kGetSourceConfig:
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("request for JSON file");
cscore: Add JSON for source settings (#1423) This allows save and restore of camera settings. The restore is a bit smarter than the save. * Fix mime types in mjpeg server * wpiutil: WPI_LOG: Make sure level is an unsigned int
2018-11-10 20:30:02 -08:00
if (auto source = GetSource()) {
SendHeader(os, 200, "OK", "application/json");
CS_Status status = CS_OK;
os << source->GetConfigJson(&status);
os.flush();
} else {
SendError(os, 404, "Resource not found");
}
break;
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
case kRootPage:
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("request for root page");
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
SendHeader(os, 200, "OK", "text/html");
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
if (auto source = GetSource()) {
SendHTML(os, *source, false);
} else {
MjpegServer: Use sink name in title. (#112) Fixes #83.
2017-11-17 09:34:30 -08:00
SendHTMLHeadTitle(os);
Adds sliders for all settable properties to the default webpage (#48) When the page is loaded, if properties can be found they will automatically be created on screen. They are currently not auto updating. Raw values are currently disabled because of this.
2017-01-19 00:02:37 -08:00
os << emptyRootPage << "\r\n";
}
MJPEGServer: Provide a bare-bones HTML root page.
2016-11-18 18:52:18 -08:00
break;
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("leaving HTTP client thread");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
// worker thread for clients that connected to this server
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::ConnThread::Main() {
Remove template types from lock RAII wrapper usages (#1756) C++17 has template type autodeduction. These wrappers include std::lock_guard and std::unique_lock.
2019-07-07 19:17:14 -07:00
std::unique_lock lock(m_mutex);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
while (m_active) {
while (!m_stream) {
m_cond.wait(lock);
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (!m_active) {
return;
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
}
lock.unlock();
ProcessRequest();
lock.lock();
m_stream = nullptr;
}
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
// Main server thread
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::ServerThreadMain() {
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
if (m_acceptor->start() != 0) {
m_active = false;
return;
}
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("waiting for clients to connect");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
while (m_active) {
auto stream = m_acceptor->accept();
if (!stream) {
m_active = false;
return;
}
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (!m_active) {
return;
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
SDEBUG("client connection from {}", stream->getPeerIP());
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
auto source = GetSource();
Replace std::lock_guard and std::lock with std::scoped_lock (#1758) std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
2019-07-08 22:58:39 -07:00
std::scoped_lock lock(m_mutex);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
// Find unoccupied worker thread, or create one if necessary
auto it = std::find_if(m_connThreads.begin(), m_connThreads.end(),
[](const wpi::SafeThreadOwner<ConnThread>& owner) {
auto thr = owner.GetThread();
return !thr || !thr->m_stream;
});
if (it == m_connThreads.end()) {
m_connThreads.emplace_back();
it = std::prev(m_connThreads.end());
}
// Start it if not already started
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
it->Start(GetName(), m_logger);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
auto nstreams =
std::count_if(m_connThreads.begin(), m_connThreads.end(),
[](const wpi::SafeThreadOwner<ConnThread>& owner) {
auto thr = owner.GetThread();
return thr && thr->m_streaming;
});
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
// Hand off connection to it
auto thr = it->GetThread();
thr->m_stream = std::move(stream);
thr->m_source = source;
MjpegServer: Limit the number of simultaneous clients to 10. This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
thr->m_noStreaming = nstreams >= 10;
MjpegServer: Add ability to set compression, etc in code (#1229) This allows code to set the stream compression, resolution, and FPS used if not specified in HTTP parameters by the client.
2018-07-27 23:00:15 -07:00
thr->m_width = GetProperty(m_widthProp)->value;
thr->m_height = GetProperty(m_heightProp)->value;
thr->m_compression = GetProperty(m_compressionProp)->value;
thr->m_defaultCompression = GetProperty(m_defaultCompressionProp)->value;
thr->m_fps = GetProperty(m_fpsProp)->value;
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
thr->m_cond.notify_one();
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Enable log macros to work with no args (#4475) This is enabled by the C++20 __VA_OPT__ feature. Uses of "{}" format string were updated. Some warning suppressions were required for older clang versions. Also improve codegen of wpi::Logger::Log(), frc::ReportError(), and frc::MakeError(); these generate better and less redundant code if they use fmt::string_view for the format string instead of templating on it.
2022-10-19 10:49:27 -07:00
SDEBUG("leaving server thread");
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
void MjpegServerImpl::SetSourceImpl(std::shared_ptr<SourceImpl> source) {
Replace std::lock_guard and std::lock with std::scoped_lock (#1758) std::scoped_lock was introduced in C++17 and is strictly better than std::lock_guard as it supports locking any number of mutexes safely. It's also easier to use than std::lock for locking multiple mutexes at once.
2019-07-08 22:58:39 -07:00
std::scoped_lock lock(m_mutex);
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
for (auto& connThread : m_connThreads) {
if (auto thr = connThread.GetThread()) {
if (thr->m_source != source) {
bool streaming = thr->m_streaming;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (thr->m_source && streaming) {
thr->m_source->DisableSink();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
thr->m_source = source;
Add braces to C++ single-line loops and conditionals (NFC) (#2973) This makes code easier to read and more consistent between C++ and Java. Also update clang-format settings to always add a line break (even if no braces are used).
2020-12-28 12:58:06 -08:00
if (source && streaming) {
thr->m_source->EnableSink();
}
MJPEGServer: Use worker thread model. Also make the worker thread a class for future per-client configuration use. Depends on wpiutil #153.
2016-11-11 00:01:58 -08:00
}
}
}
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
namespace cs {
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
CS_Sink CreateMjpegServer(std::string_view name, std::string_view listenAddress,
int port, CS_Status* status) {
cscore: Change impl to only one singleton (#1398) This avoids a number of shutdown use-after-free races by controlling the destruction order. It also is a prerequisite to making the internal interfaces mockable for unit testing.
2018-10-31 20:22:58 -07:00
auto& inst = Instance::GetInstance();
cscore: Refactor sink and source creation Also make sources and sinks members of Instance private, with appropriate accessor functions.
2018-11-06 19:42:39 -08:00
return inst.CreateSink(
CS_SINK_MJPEG,
std::make_shared<MjpegServerImpl>(
name, inst.logger, inst.notifier, inst.telemetry, listenAddress, port,
Use std::string_view and fmtlib across all libraries (#3402) - Twine, StringRef, Format, and NativeFormatting have been removed - Logging now uses fmtlib style formatting - Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or std::puts()/std::fputs() (for unformatted strings). - A wpi/fmt/raw_ostream.h header has been added to enable fmt::print() with wpi::raw_ostream
2021-06-06 16:13:58 -07:00
std::unique_ptr<wpi::NetworkAcceptor>(
new wpi::TCPAcceptor(port, listenAddress, inst.logger))));
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
std::string GetMjpegServerListenAddress(CS_Sink sink, CS_Status* status) {
cscore: Refactor sink and source creation Also make sources and sinks members of Instance private, with appropriate accessor functions.
2018-11-06 19:42:39 -08:00
auto data = Instance::GetInstance().GetSink(sink);
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
if (!data || data->kind != CS_SINK_MJPEG) {
*status = CS_INVALID_HANDLE;
return std::string{};
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
return static_cast<MjpegServerImpl&>(*data->sink).GetListenAddress();
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
int GetMjpegServerPort(CS_Sink sink, CS_Status* status) {
cscore: Refactor sink and source creation Also make sources and sinks members of Instance private, with appropriate accessor functions.
2018-11-06 19:42:39 -08:00
auto data = Instance::GetInstance().GetSink(sink);
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
if (!data || data->kind != CS_SINK_MJPEG) {
*status = CS_INVALID_HANDLE;
return 0;
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
return static_cast<MjpegServerImpl&>(*data->sink).GetPort();
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
} // namespace cs
extern "C" {
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
CS_Sink CS_CreateMjpegServer(const char* name, const char* listenAddress,
Rename HTTPSink to MJPEGServer.
2016-10-15 22:44:26 -07:00
int port, CS_Status* status) {
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
return cs::CreateMjpegServer(name, listenAddress, port, status);
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
char* CS_GetMjpegServerListenAddress(CS_Sink sink, CS_Status* status) {
return ConvertToC(cs::GetMjpegServerListenAddress(sink, status));
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
}
Change acronym class names to use MixedCase (UsbCamera, MjpegServer). (#22)
2016-12-04 00:08:47 -08:00
int CS_GetMjpegServerPort(CS_Sink sink, CS_Status* status) {
return cs::GetMjpegServerPort(sink, status);
Add data accessors for USBCamera and MJPEGServer. USBCamera: getPath() MJPEGServer: getListenAddress() and getPort()
2016-11-18 17:21:03 -08:00
}
Initial HTTPSink implementation. Untested.
2016-09-08 00:05:10 -07:00
} // extern "C"
Reference in New Issue Copy Permalink