frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge d07feea13cdcbcffb0dad0008ba8c9131e50029e into dd81a23dfca5b434b7199153ab08c06cf611b3c7

Browse Source
This commit is contained in:
xIronic 2025-02-24 13:40:10 +00:00 committed by GitHub
commit 50b1417a9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 133 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support direct or multiple instance addressing via single requests (#809)
- Support of `serverinfo` subcommands: `getInfo, subscribe, unsubscribe, getSubscriptions, getSubscriptionCommands`
- [Overview](https://github.com/hyperion-project/hyperion.ng/blob/API_Auth/doc/development/JSON-API%20_Commands_Overview.md) of API commands and subscription updates
- Support for requesting instance-data via JSON-API. Implemented requesting the current image in different formats or led colors.
### Changed

21
include/api/JsonAPI.h
View File

@ -285,6 +285,25 @@ private:
///
void handleSystemCommand(const QJsonObject &message, const JsonApiCommand& cmd);
/// Handle an incoming data request message
///
/// @param message the incoming message
///
void handleInstanceDataCommand(const QJsonObject &message, const JsonApiCommand& cmd);
/// Handle an incoming JSON message to request the current image
///
/// @param message the incoming message
///
void handleGetImageSnapshotCommand(const QJsonObject &message, const JsonApiCommand& cmd);
/// Handle an incoming JSON message to request the current led colors
///
/// @param message the incoming message
///
void handleGetLedSnapshotCommand(const QJsonObject &message, const JsonApiCommand& cmd);
void applyColorAdjustments(const QJsonObject &adjustment, ColorAdjustment *colorAdjustment);
void applyColorAdjustment(const QString &colorName, const QJsonObject &adjustment, RgbChannelAdjustment &rgbAdjustment);
void applyGammaTransform(const QString &transformName, const QJsonObject &adjustment, RgbTransform &rgbTransform, char channel);
@ -404,4 +423,6 @@ private:
// The JsonCallbacks instance which handles data subscription/notifications
QSharedPointer<JsonCallbacks> _jsonCB;
};

9
include/api/JsonApiCommand.h
View File

@ -23,6 +23,7 @@ public:
Image,
InputSource,
Instance,
InstanceData,
LedColors,
LedDevice,
Logging,
@ -53,6 +54,7 @@ public:
case Image: return "image";
case InputSource: return "inputsource";
case Instance: return "instance";
case InstanceData: return "instance-data";
case LedColors: return "ledcolors";
case LedDevice: return "leddevice";
case Logging: return "logging";
@ -85,7 +87,9 @@ public:
Discover,
GetConfig,
GetConfigOld,
GetImageSnapshot,
GetInfo,
GetLedSnapshot,
GetPendingTokenRequests,
GetProperties,
GetSchema,
@ -136,7 +140,9 @@ public:
case Discover: return "discover";
case GetConfig: return "getconfig";
case GetConfigOld: return "getconfig-old";
case GetImageSnapshot: return "getImageSnapshot";
case GetInfo: return "getInfo";
case GetLedSnapshot: return "getLedSnapshot";
case GetPendingTokenRequests: return "getPendingTokenRequests";
case GetProperties: return "getProperties";
case GetSchema: return "getschema";
@ -294,6 +300,9 @@ public:
{ {"instance", "startInstance"}, { Command::Instance, SubCommand::StartInstance, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} },
{ {"instance", "stopInstance"}, { Command::Instance, SubCommand::StopInstance, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} },
{ {"instance", "switchTo"}, { Command::Instance, SubCommand::SwitchTo, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} },
{ {"instance-data", ""}, { Command::InstanceData, SubCommand::Empty, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} },
{ {"instance-data", "getImageSnapshot"}, { Command::InstanceData, SubCommand::GetImageSnapshot, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} },
{ {"instance-data", "getLedSnapshot"}, { Command::InstanceData, SubCommand::GetLedSnapshot, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes } },
{ {"ledcolors", "imagestream-start"}, { Command::LedColors, SubCommand::ImageStreamStart, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} },
{ {"ledcolors", "imagestream-stop"}, { Command::LedColors, SubCommand::ImageStreamStop, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} },
{ {"ledcolors", "ledstream-start"}, { Command::LedColors, SubCommand::LedStreamStart, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} },

29
libsrc/api/JSONRPC_schema/schema-instancedata.json Normal file
View File

@ -0,0 +1,29 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["instance-data"]
},
"subcommand" : {
"type" : "string",
"required" : true,
"enum" : ["getImageSnapshot","getLedSnapshot"]
},
"instance" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"filetype" : {
"type" : "string",
"enum" : ["BMP","JPG","PNG"]
},
"tan" : {
"type" : "integer"
}
},
"additionalProperties": false
}

2
libsrc/api/JSONRPC_schema/schema.json
View File

@ -5,7 +5,7 @@
"command": {
"type" : "string",
"required" : true,
"enum": [ "color", "image", "effect", "create-effect", "delete-effect", "serverinfo", "clear", "clearall", "adjustment", "sourceselect", "config", "componentstate", "ledcolors", "logging", "processing", "sysinfo", "videomode", "authorize", "instance", "leddevice", "inputsource", "service", "system", "transform", "correction", "temperature" ]
"enum": [ "color", "image", "effect", "create-effect", "delete-effect", "serverinfo", "clear", "clearall", "adjustment", "sourceselect", "config", "componentstate", "ledcolors", "logging", "processing", "sysinfo", "videomode", "authorize", "instance", "instance-data", "leddevice", "inputsource", "service", "system", "transform", "correction", "temperature" ]
}
}
}

1
libsrc/api/JSONRPC_schemas.qrc
View File

@ -20,6 +20,7 @@
<file alias="schema-videomode">JSONRPC_schema/schema-videomode.json</file>
<file alias="schema-authorize">JSONRPC_schema/schema-authorize.json</file>
<file alias="schema-instance">JSONRPC_schema/schema-instance.json</file>
<file alias="schema-instance-data">JSONRPC_schema/schema-instancedata.json</file>
<file alias="schema-leddevice">JSONRPC_schema/schema-leddevice.json</file>
<file alias="schema-inputsource">JSONRPC_schema/schema-inputsource.json</file>
<file alias="schema-service">JSONRPC_schema/schema-service.json</file>

71
libsrc/api/JsonAPI.cpp
View File

@ -386,6 +386,9 @@ void JsonAPI::handleCommand(const JsonApiCommand& cmd, const QJsonObject &messag
case Command::ClearAll:
handleClearallCommand(message, cmd);
break;
case Command::InstanceData:
handleInstanceDataCommand(message, cmd);
break;
// BEGIN | The following commands are deprecated but used to ensure backward compatibility with Hyperion Classic remote control
case Command::Transform:
case Command::Correction:
@ -398,6 +401,74 @@ void JsonAPI::handleCommand(const JsonApiCommand& cmd, const QJsonObject &messag
}
}
void JsonAPI::handleGetImageSnapshotCommand(const QJsonObject &message, const JsonApiCommand &cmd)
{
QString replyMsg;
QString filetype = message["filetype"].toString();
const PriorityMuxer::InputInfo priorityInfo = _hyperion->getPriorityInfo(_hyperion->getCurrentPriority());
Image<ColorRgb> image = priorityInfo.image;
QImage snapshot(reinterpret_cast<const uchar *>(image.memptr()), image.width(), image.height(), qsizetype(3) * image.width(), QImage::Format_RGB888);
QByteArray byteArray;
QBuffer buffer{&byteArray};
buffer.open(QIODevice::WriteOnly);
if (!snapshot.save(&buffer, filetype.toUtf8().constData()))
{
replyMsg = QString("Failed to create snapshot of the current image in %1 format").arg(filetype);
sendErrorReply(replyMsg, cmd);
return;
}
QByteArray base64Image = byteArray.toBase64();
QJsonObject info;
info["format"] = filetype;
info["width"] = image.width();
info["height"] = image.height();
info["data"] = QString::fromLatin1(base64Image.data());
sendSuccessDataReply(info, cmd);
}
void JsonAPI::handleGetLedSnapshotCommand(const QJsonObject &message, const JsonApiCommand &cmd)
{
QString replyMsg;
const PriorityMuxer::InputInfo priorityInfo = _hyperion->getPriorityInfo(_hyperion->getCurrentPriority());
const std::vector<ColorRgb> ledColors = _hyperion->getImageProcessor()->process(priorityInfo.image);
if (ledColors.empty())
{
replyMsg = "No led colors available";
sendErrorReply(replyMsg, cmd);
return;
}
QJsonArray ledColorsArray;
for (const auto &color : ledColors)
{
QJsonArray rgbArray;
rgbArray.append(color.red);
rgbArray.append(color.green);
rgbArray.append(color.blue);
ledColorsArray.append(rgbArray);
}
QJsonObject info;
info["leds"] = ledColorsArray;
sendSuccessDataReply(info, cmd);
}
void JsonAPI::handleInstanceDataCommand(const QJsonObject &message, const JsonApiCommand &cmd)
{
switch (cmd.subCommand)
{
case SubCommand::GetImageSnapshot:
handleGetImageSnapshotCommand(message, cmd);
break;
case SubCommand::GetLedSnapshot:
handleGetLedSnapshotCommand(message, cmd);
break;
default:
break;
}
}
void JsonAPI::handleColorCommand(const QJsonObject &message, const JsonApiCommand& cmd)
{
emit forwardJsonMessage(message);