From b9a72c8b49b24efcfddf5b3833398ed6315fb0ed Mon Sep 17 00:00:00 2001 From: xIronic Date: Thu, 20 Feb 2025 21:04:54 +0100 Subject: [PATCH] Implemented a method to receive and store a snapshot of the current image via JSON. --- include/api/JsonAPI.h | 6 ++- include/api/JsonApiCommand.h | 7 +++- .../schema-getcurrentimage.json | 19 +++++++++ libsrc/api/JSONRPC_schema/schema.json | 2 +- libsrc/api/JSONRPC_schemas.qrc | 1 + libsrc/api/JsonAPI.cpp | 42 +++++++++++++++++++ 6 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 libsrc/api/JSONRPC_schema/schema-getcurrentimage.json diff --git a/include/api/JsonAPI.h b/include/api/JsonAPI.h index a5a54065..2c342210 100644 --- a/include/api/JsonAPI.h +++ b/include/api/JsonAPI.h @@ -285,6 +285,11 @@ private: /// void handleSystemCommand(const QJsonObject &message, const JsonApiCommand& cmd); + /// @brief Handle an incoming JSON message for actions related to the current image + /// @param message the incoming message + /// + void handleGetCurrentImageCommand(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); @@ -403,5 +408,4 @@ private: // The JsonCallbacks instance which handles data subscription/notifications QSharedPointer _jsonCB; - }; diff --git a/include/api/JsonApiCommand.h b/include/api/JsonApiCommand.h index 4345b56a..5e7f80b4 100644 --- a/include/api/JsonApiCommand.h +++ b/include/api/JsonApiCommand.h @@ -34,7 +34,8 @@ public: System, Temperature, Transform, - VideoMode + VideoMode, + GetCurrentImage }; static QString toString(Type type) { @@ -65,6 +66,7 @@ public: case Transform: return "transform"; case VideoMode: return "videomode"; case Service: return "service"; + case GetCurrentImage: return "getcurrentimage"; default: return "unknown"; } } @@ -322,7 +324,8 @@ public: { {"system", "toggleIdle"}, { Command::System, SubCommand::ToggleIdle, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} }, { {"temperature", ""}, { Command::Temperature, SubCommand::Empty, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} }, { {"transform", ""}, { Command::Transform, SubCommand::Empty, Authorization::Yes, InstanceCmd::Yes, NoListenerCmd::Yes} }, - { {"videomode", ""}, { Command::VideoMode, SubCommand::Empty, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} } + { {"videomode", ""}, { Command::VideoMode, SubCommand::Empty, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} }, + { {"getcurrentimage", ""}, { Command::GetCurrentImage, SubCommand::Empty, Authorization::Yes, InstanceCmd::No, NoListenerCmd::Yes} } }; return commandLookup; } diff --git a/libsrc/api/JSONRPC_schema/schema-getcurrentimage.json b/libsrc/api/JSONRPC_schema/schema-getcurrentimage.json new file mode 100644 index 00000000..e7e63f50 --- /dev/null +++ b/libsrc/api/JSONRPC_schema/schema-getcurrentimage.json @@ -0,0 +1,19 @@ +{ + "type":"object", + "required":true, + "properties":{ + "command": { + "type" : "string", + "required" : true, + "enum" : ["getcurrentimage"] + }, + "tan" : { + "type" : "integer" + }, + "path": { + "type": "string", + "required": false + } + }, + "additionalProperties": false +} diff --git a/libsrc/api/JSONRPC_schema/schema.json b/libsrc/api/JSONRPC_schema/schema.json index 4f742b2b..6bcd4403 100644 --- a/libsrc/api/JSONRPC_schema/schema.json +++ b/libsrc/api/JSONRPC_schema/schema.json @@ -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", "leddevice", "inputsource", "service", "system", "transform", "correction", "temperature", "getcurrentimage" ] } } } diff --git a/libsrc/api/JSONRPC_schemas.qrc b/libsrc/api/JSONRPC_schemas.qrc index 60e1c171..3782712c 100644 --- a/libsrc/api/JSONRPC_schemas.qrc +++ b/libsrc/api/JSONRPC_schemas.qrc @@ -4,6 +4,7 @@ JSONRPC_schema/schema-color.json JSONRPC_schema/schema-image.json JSONRPC_schema/schema-serverinfo.json + JSONRPC_schema/schema-getcurrentimage.json JSONRPC_schema/schema-sysinfo.json JSONRPC_schema/schema-clear.json JSONRPC_schema/schema-clearall.json diff --git a/libsrc/api/JsonAPI.cpp b/libsrc/api/JsonAPI.cpp index 96dc365d..3f9b702f 100644 --- a/libsrc/api/JsonAPI.cpp +++ b/libsrc/api/JsonAPI.cpp @@ -393,11 +393,53 @@ void JsonAPI::handleCommand(const JsonApiCommand& cmd, const QJsonObject &messag sendErrorReply("The command is deprecated, please use the Hyperion Web Interface to configure", cmd); break; // END + case Command::GetCurrentImage: + handleGetCurrentImageCommand(message, cmd); + break; default: break; } } +void JsonAPI::handleGetCurrentImageCommand(const QJsonObject &message, const JsonApiCommand& cmd) +{ + QString replyMsg; + + Debug(_log, "Get image command received"); + QString savePath = message["path"].toString(); + + Debug(_log,"Save path: %s", QSTRING_CSTR(savePath)); + + int priority = _hyperion->getCurrentPriority(); + const PriorityMuxer::InputInfo priorityInfo = _hyperion->getPriorityInfo(priority); + Image image = priorityInfo.image; + + QImage jpgImage(reinterpret_cast(image.memptr()), image.width(), image.height(), qsizetype(3) * image.width(), QImage::Format_RGB888); + QByteArray byteArray; + QBuffer buffer(&byteArray); + buffer.open(QIODevice::WriteOnly); + jpgImage.save(&buffer, "JPG"); + QString base64Image = QString::fromLatin1(byteArray.toBase64().data()); + if (!savePath.isEmpty()) + { + if (!jpgImage.save(savePath, "JPG")) + { + replyMsg = "Failed to save image to: " + savePath; + sendErrorReply(replyMsg, cmd); + return; + } + } + + QJsonObject info; + info["path"] = savePath; + info["format"] = "JPG"; + info["width"] = image.width(); + info["height"] = image.height(); + info["size"] = image.width() * image.height() * 3; + info["data"] = base64Image; + sendSuccessDataReply(info, cmd); +} + void JsonAPI::handleColorCommand(const QJsonObject &message, const JsonApiCommand& cmd) { emit forwardJsonMessage(message);