Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Publish video modes to webserver. (#58)

Browse Source 
This puts a table of modes onto the main webpage and also adds them to
the JSON output.

Fixes #50.
This commit is contained in:
Peter Johnson
2017-02-16 01:06:38 -08:00
committed by GitHub
parent ef25bbde75
commit 878d3a6f4f
1 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/MjpegServerImpl.cpp
View File

@@ -55,6 +55,12 @@ static const char* startRootPage = "<html><head>\n"
" httpGetAsync(name, val);\n"
"}\n"
"</script>\n"
"<style>\n"
"table, th, td {\n"
" border: 1px solid black;\n"
" border-collapse: collapse;\n"
"}\n"
"</style>\n"
"<title>CameraServer</title></head><body>\n"
"<img src=\"/stream.mjpg\" /><p />\n"
"<a href=\"/settings.json\">Settings JSON</a>\n";
@@ -386,6 +392,28 @@ void MjpegServerImpl::ConnThread::SendHTML(llvm::raw_ostream& os,
}
}
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) {
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;
default: os << "unknown"; break;
}
os << "</td><td>" << mode.width;
os << "</td><td>" << mode.height;
os << "</td><td>" << mode.fps;
os << "</td></tr>";
}
os << "</table>\n";
os << endRootPage << "\r\n";
os.flush();
}
@@ -404,7 +432,7 @@ void MjpegServerImpl::ConnThread::SendJSON(llvm::raw_ostream& os,
first = false;
else
os << ",\n";
os << "{";
os << '{';
llvm::SmallString<128> name_buf;
auto name = source.GetPropertyName(prop, name_buf, &status);
auto kind = source.GetPropertyKind(prop);
@@ -453,6 +481,28 @@ void MjpegServerImpl::ConnThread::SendJSON(llvm::raw_ostream& os,
}
os << '}';
}
os << "\n],\n\"modes\": [\n";
first = true;
for (auto mode : source.EnumerateVideoModes(&status)) {
if (first)
first = false;
else
os << ",\n";
os << '{';
os << "\n\"pixelFormat\": \"";
switch (mode.pixelFormat) {
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;
default: os << "unknown"; break;
}
os << "\",\n\"width\": \"" << mode.width << '"';
os << ",\n\"height\": \"" << mode.height << '"';
os << ",\n\"fps\": \"" << mode.fps << '"';
os << '}';
}
os << "\n]\n}\n";
os.flush();
}