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

Update for jart/json.cpp change

Browse Source
This commit is contained in:
Peter Johnson
2026-03-29 15:38:18 -07:00
parent de3e211fdb
commit 9ca93fa190
120 changed files with 1240 additions and 1087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cscore/src/main/native/cpp/PropertyContainer.cpp
View File

@@ -6,6 +6,7 @@
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "wpi/util/Logger.hpp"
@@ -244,11 +245,11 @@ bool PropertyContainer::SetPropertiesJson(const wpi::util::json& config,
wpi::util::Logger& logger,
std::string_view logName,
CS_Status* status) {
for (auto&& prop : config) {
for (auto&& prop : config.get_array()) {
std::string name;
try {
name = prop.at("name").get<std::string>();
} catch (const wpi::util::json::exception& e) {
name = prop.at("name").get_string();
} catch (const std::logic_error& e) {
WPI_WARNING(logger, "{}: SetConfigJson: could not read property name: {}",
logName, e.what());
continue;
@@ -257,22 +258,22 @@ bool PropertyContainer::SetPropertiesJson(const wpi::util::json& config,
try {
auto& v = prop.at("value");
if (v.is_string()) {
std::string val = v.get<std::string>();
std::string val = v.get_string();
WPI_INFO(logger, "{}: SetConfigJson: setting property '{}' to '{}'",
logName, name, val);
SetStringProperty(n, val, status);
} else if (v.is_boolean()) {
bool val = v.get<bool>();
} else if (v.is_bool()) {
bool val = v.get_bool();
WPI_INFO(logger, "{}: SetConfigJson: setting property '{}' to {}",
logName, name, val);
SetProperty(n, val, status);
} else {
int val = v.get<int>();
int val = v.get_int();
WPI_INFO(logger, "{}: SetConfigJson: setting property '{}' to {}",
logName, name, val);
SetProperty(n, val, status);
}
} catch (const wpi::util::json::exception& e) {
} catch (const std::logic_error& e) {
WPI_WARNING(logger,
"{}: SetConfigJson: could not read property value: {}",
logName, e.what());
@@ -289,22 +290,22 @@ wpi::util::json PropertyContainer::GetPropertiesJsonObject(CS_Status* status) {
for (int p : EnumerateProperties(propVec, status)) {
wpi::util::json prop;
wpi::util::SmallString<128> strBuf;
prop.emplace("name", GetPropertyName(p, strBuf, status));
prop["name"] = GetPropertyName(p, strBuf, status);
switch (GetPropertyKind(p)) {
case CS_PROP_BOOLEAN:
prop.emplace("value", static_cast<bool>(GetProperty(p, status)));
prop["value"] = static_cast<bool>(GetProperty(p, status));
break;
case CS_PROP_INTEGER:
case CS_PROP_ENUM:
prop.emplace("value", GetProperty(p, status));
prop["value"] = GetProperty(p, status);
break;
case CS_PROP_STRING:
prop.emplace("value", GetStringProperty(p, strBuf, status));
prop["value"] = GetStringProperty(p, strBuf, status);
break;
default:
continue;
}
j.emplace_back(prop);
j.emplace_back(std::move(prop));
}
return j;

2
cscore/src/main/native/cpp/PropertyContainer.hpp
View File

@@ -15,13 +15,13 @@
#include "PropertyImpl.hpp"
#include "wpi/cs/cscore_c.h"
#include "wpi/util/StringMap.hpp"
#include "wpi/util/json_fwd.hpp"
#include "wpi/util/mutex.hpp"
namespace wpi::util {
class Logger;
template <typename T>
class SmallVectorImpl;
class json;
} // namespace wpi::util
namespace wpi::cs {

19
cscore/src/main/native/cpp/SinkImpl.cpp
View File

@@ -5,6 +5,7 @@
#include "SinkImpl.hpp"
#include <string>
#include <utility>
#include "Instance.hpp"
#include "Notifier.hpp"
@@ -128,20 +129,18 @@ std::string_view SinkImpl::GetError(
}
bool SinkImpl::SetConfigJson(std::string_view config, CS_Status* status) {
wpi::util::json j;
try {
j = wpi::util::json::parse(config);
} catch (const wpi::util::json::parse_error& e) {
SWARNING("SetConfigJson: parse error at byte {}: {}", e.byte, e.what());
auto j = wpi::util::json::parse(config);
if (!j) {
SWARNING("SetConfigJson: parse error: {}", j.error());
*status = CS_PROPERTY_WRITE_FAILED;
return false;
}
return SetConfigJson(j, status);
return SetConfigJson(*j, status);
}
bool SinkImpl::SetConfigJson(const wpi::util::json& config, CS_Status* status) {
if (config.count("properties") != 0) {
SetPropertiesJson(config.at("properties"), m_logger, GetName(), status);
if (auto properties = config.lookup("properties")) {
SetPropertiesJson(*properties, m_logger, GetName(), status);
}
return true;
@@ -150,7 +149,7 @@ bool SinkImpl::SetConfigJson(const wpi::util::json& config, CS_Status* status) {
std::string SinkImpl::GetConfigJson(CS_Status* status) {
std::string rv;
wpi::util::raw_string_ostream os(rv);
GetConfigJsonObject(status).dump(os, 4);
GetConfigJsonObject(status).marshal(os, true, 4);
os.flush();
return rv;
}
@@ -160,7 +159,7 @@ wpi::util::json SinkImpl::GetConfigJsonObject(CS_Status* status) {
wpi::util::json props = GetPropertiesJsonObject(status);
if (props.is_array()) {
j.emplace("properties", props);
j["properties"] = std::move(props);
}
return j;

5
cscore/src/main/native/cpp/SinkImpl.hpp
View File

@@ -10,7 +10,10 @@
#include "SourceImpl.hpp"
#include "wpi/util/Logger.hpp"
#include "wpi/util/json_fwd.hpp"
namespace wpi::util {
class json;
} // namespace wpi::util
namespace wpi::cs {

79
cscore/src/main/native/cpp/SourceImpl.cpp
View File

@@ -180,15 +180,13 @@ bool SourceImpl::SetFPS(int fps, CS_Status* status) {
}
bool SourceImpl::SetConfigJson(std::string_view config, CS_Status* status) {
wpi::util::json j;
try {
j = wpi::util::json::parse(config);
} catch (const wpi::util::json::parse_error& e) {
SWARNING("SetConfigJson: parse error at byte {}: {}", e.byte, e.what());
auto j = wpi::util::json::parse(config);
if (!j) {
SWARNING("SetConfigJson: parse error: {}", j.error());
*status = CS_PROPERTY_WRITE_FAILED;
return false;
}
return SetConfigJson(j, status);
return SetConfigJson(*j, status);
}
bool SourceImpl::SetConfigJson(const wpi::util::json& config,
@@ -196,9 +194,9 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
VideoMode mode;
// pixel format
if (config.count("pixel format") != 0) {
if (auto pixelFormat = config.lookup("pixel format")) {
try {
auto str = config.at("pixel format").get<std::string>();
auto str = pixelFormat->get_string();
if (wpi::util::equals_lower(str, "mjpeg")) {
mode.pixelFormat = wpi::util::PixelFormat::MJPEG;
} else if (wpi::util::equals_lower(str, "yuyv")) {
@@ -219,34 +217,34 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
SWARNING("SetConfigJson: could not understand pixel format value '{}'",
str);
}
} catch (const wpi::util::json::exception& e) {
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read pixel format: {}", e.what());
}
}
// width
if (config.count("width") != 0) {
if (auto width = config.lookup("width")) {
try {
mode.width = config.at("width").get<unsigned int>();
} catch (const wpi::util::json::exception& e) {
mode.width = width->get_int();
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read width: {}", e.what());
}
}
// height
if (config.count("height") != 0) {
if (auto height = config.lookup("height")) {
try {
mode.height = config.at("height").get<unsigned int>();
} catch (const wpi::util::json::exception& e) {
mode.height = height->get_int();
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read height: {}", e.what());
}
}
// fps
if (config.count("fps") != 0) {
if (auto fps = config.lookup("fps")) {
try {
mode.fps = config.at("fps").get<unsigned int>();
} catch (const wpi::util::json::exception& e) {
mode.fps = fps->get_int();
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read fps: {}", e.what());
}
}
@@ -277,22 +275,21 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
}
// brightness
if (config.count("brightness") != 0) {
if (auto brightness = config.lookup("brightness")) {
try {
int val = config.at("brightness").get<int>();
int val = brightness->get_int();
SINFO("SetConfigJson: setting brightness to {}", val);
SetBrightness(val, status);
} catch (const wpi::util::json::exception& e) {
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read brightness: {}", e.what());
}
}
// white balance
if (config.count("white balance") != 0) {
if (auto whiteBalance = config.lookup("white balance")) {
try {
auto& setting = config.at("white balance");
if (setting.is_string()) {
auto str = setting.get<std::string>();
if (whiteBalance->is_string()) {
auto str = whiteBalance->get_string();
if (wpi::util::equals_lower(str, "auto")) {
SINFO("SetConfigJson: setting white balance to {}", "auto");
SetWhiteBalanceAuto(status);
@@ -305,21 +302,20 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
str);
}
} else {
int val = setting.get<int>();
int val = whiteBalance->get_int();
SINFO("SetConfigJson: setting white balance to {}", val);
SetWhiteBalanceManual(val, status);
}
} catch (const wpi::util::json::exception& e) {
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read white balance: {}", e.what());
}
}
// exposure
if (config.count("exposure") != 0) {
if (auto exposure = config.lookup("exposure")) {
try {
auto& setting = config.at("exposure");
if (setting.is_string()) {
auto str = setting.get<std::string>();
if (exposure->is_string()) {
auto str = exposure->get_string();
if (wpi::util::equals_lower(str, "auto")) {
SINFO("SetConfigJson: setting exposure to {}", "auto");
SetExposureAuto(status);
@@ -331,18 +327,18 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
str);
}
} else {
int val = setting.get<int>();
int val = exposure->get_int();
SINFO("SetConfigJson: setting exposure to {}", val);
SetExposureManual(val, status);
}
} catch (const wpi::util::json::exception& e) {
} catch (const std::logic_error& e) {
SWARNING("SetConfigJson: could not read exposure: {}", e.what());
}
}
// properties
if (config.count("properties") != 0) {
SetPropertiesJson(config.at("properties"), m_logger, GetName(), status);
if (auto properties = config.lookup("properties")) {
SetPropertiesJson(*properties, m_logger, GetName(), status);
}
return true;
@@ -351,8 +347,7 @@ bool SourceImpl::SetConfigJson(const wpi::util::json& config,
std::string SourceImpl::GetConfigJson(CS_Status* status) {
std::string rv;
wpi::util::raw_string_ostream os(rv);
GetConfigJsonObject(status).dump(os, 4);
os.flush();
GetConfigJsonObject(status).marshal(os, true, 4);
return rv;
}
@@ -390,22 +385,22 @@ wpi::util::json SourceImpl::GetConfigJsonObject(CS_Status* status) {
break;
}
if (!pixelFormat.empty()) {
j.emplace("pixel format", pixelFormat);
j["pixel format"] = pixelFormat;
}
// width
if (m_mode.width != 0) {
j.emplace("width", m_mode.width);
j["width"] = m_mode.width;
}
// height
if (m_mode.height != 0) {
j.emplace("height", m_mode.height);
j["height"] = m_mode.height;
}
// fps
if (m_mode.fps != 0) {
j.emplace("fps", m_mode.fps);
j["fps"] = m_mode.fps;
}
// TODO: output brightness, white balance, and exposure?
@@ -413,7 +408,7 @@ wpi::util::json SourceImpl::GetConfigJsonObject(CS_Status* status) {
// properties
wpi::util::json props = GetPropertiesJsonObject(status);
if (props.is_array()) {
j.emplace("properties", props);
j["properties"] = std::move(props);
}
return j;

5
cscore/src/main/native/cpp/SourceImpl.hpp
View File

@@ -20,9 +20,12 @@
#include "wpi/util/PixelFormat.hpp"
#include "wpi/util/RawFrame.h"
#include "wpi/util/condition_variable.hpp"
#include "wpi/util/json_fwd.hpp"
#include "wpi/util/mutex.hpp"
namespace wpi::util {
class json;
} // namespace wpi::util
namespace wpi::cs {
class Notifier;

5
cscore/src/main/native/include/wpi/cs/VideoSink.hpp
View File

@@ -12,7 +12,10 @@
#include "wpi/cs/VideoProperty.hpp"
#include "wpi/cs/VideoSource.hpp"
#include "wpi/cs/cscore_cpp.hpp"
#include "wpi/util/json_fwd.hpp"
namespace wpi::util {
class json;
} // namespace wpi::util
namespace wpi::cs {

5
cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
View File

@@ -18,7 +18,6 @@
#include "wpi/cs/cscore_c.h"
#include "wpi/util/PixelFormat.hpp"
#include "wpi/util/SmallVector.hpp"
#include "wpi/util/json_fwd.hpp"
#ifdef _WIN32
// Disable uninitialized variable warnings
@@ -26,6 +25,10 @@
#pragma warning(disable : 26495)
#endif
namespace wpi::util {
class json;
} // namespace wpi::util
/** CameraServer (cscore) namespace */
namespace wpi::cs {