Skip to content

Transfer RGBA data to flatbuffer server #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2022
Merged

Transfer RGBA data to flatbuffer server #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 13 additions & 28 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,44 +135,29 @@ set(FLATBUFFERS_FLATC_EXECUTABLE "$<TARGET_FILE:flatc>")
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${FLATBUFFERS_INCLUDE_DIRS}
${OBS_FRONTEND_INCLUDE_DIR}
${LIBOBS_INCLUDE_DIR}
)

set(Flatbuffer_GENERATED_FBS
hyperion_reply_generated.h
hyperion_request_generated.h
)
set(FLATBUFFERS_SCHEMA "${CMAKE_SOURCE_DIR}/src/FlatBufferSchema.fbs")
set(FLATBUFFERS_HEADER "${CMAKE_BINARY_DIR}/FlatBufferSchema_generated.h")

set(Flatbuffer_FBS
${CMAKE_SOURCE_DIR}/src/hyperion_reply.fbs
${CMAKE_SOURCE_DIR}/src/hyperion_request.fbs
add_custom_command(
OUTPUT ${FLATBUFFERS_HEADER}
COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE}
ARGS -c --no-includes --gen-mutable -o ${CMAKE_CURRENT_BINARY_DIR} ${FLATBUFFERS_SCHEMA}
DEPENDS ${FLATBUFFERS_FLATC_EXECUTABLE} ${FLATBUFFERS_SCHEMA}
COMMENT "Building Flatbuffer header file"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

foreach(FBS_FILE ${Flatbuffer_FBS})
get_filename_component(FLATC_OUTPUT ${FBS_FILE} NAME_WE)
set(FLATC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FLATC_OUTPUT}_generated.h)

add_custom_command(
OUTPUT ${FLATC_OUTPUT}
COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE}
ARGS -c --no-includes --gen-mutable -o ${CMAKE_CURRENT_BINARY_DIR} ${FBS_FILE}
DEPENDS ${FLATBUFFERS_FLATC_EXECUTABLE} ${FBS_FILE}
COMMENT "Building C++ header for ${FBS_FILE}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endforeach()

set_source_files_properties(${Flatbuffer_GENERATED_FBS} PROPERTIES GENERATED TRUE)
set_source_files_properties(${FLATBUFFERS_HEADER} PROPERTIES GENERATED TRUE)

FILE ( GLOB hyperion_obs_SOURCES "${CMAKE_SOURCE_DIR}/src/*.h" "${CMAKE_SOURCE_DIR}/src/*.cpp" )

add_library(${PROJECT_NAME} MODULE
${hyperion_obs_SOURCES}
${Flatbuffer_GENERATED_FBS}
)

include_directories(
${OBS_FRONTEND_INCLUDE_DIR}
${LIBOBS_INCLUDE_DIR}
${FLATBUFFERS_HEADER}
)

if (UNIX)
Expand Down
119 changes: 0 additions & 119 deletions src/ColorRgb.h
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions src/FlatBufferConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
// stl includes
#include <stdexcept>

// Qt includes
#include <QRgb>

// flatbuffer includes
// includes flatbuffer header and generated schema
#include "FlatBufferConnection.h"

// flatbuffer FBS
#include "hyperion_reply_generated.h"
#include "hyperion_request_generated.h"
#include "FlatBufferSchema_generated.h"

FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString& host, int priority, quint16 port)
: _socket()
Expand Down Expand Up @@ -97,7 +91,7 @@ void FlatBufferConnection::setRegister(const QString& origin, int priority)
_builder.Clear();
}

void FlatBufferConnection::setImage(const Image<ColorRgb> &image)
void FlatBufferConnection::setImage(const Image<ColorRgba> &image)
{
auto imgData = _builder.CreateVector(reinterpret_cast<const uint8_t*>(image.memptr()), image.size());
auto rawImg = hyperionnet::CreateRawImage(_builder, imgData, image.width(), image.height());
Expand Down
10 changes: 2 additions & 8 deletions src/FlatBufferConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@

// Qt includes
#include <QString>
#include <QColor>
#include <QTcpSocket>
#include <QTimer>
#include <QMap>
#include <QHostAddress>

// hyperion util
#include "Image.h"
#include "ColorRgb.h"

#include <flatbuffers/flatbuffers.h>
#include "Image.h"

const int FLATBUFFER_DEFAULT_PORT = 19400;

Expand Down Expand Up @@ -62,7 +56,7 @@ public slots:
/// @brief Set the leds according to the given image
/// @param image The image
///
void setImage(const Image<ColorRgb> &image);
void setImage(const Image<ColorRgba> &image);

signals:

Expand Down
8 changes: 8 additions & 0 deletions src/hyperion_request.fbs → src/FlatBufferSchema.fbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@ table Request {
}

root_type Request;

table Reply {
error:string;
video:int = -1;
registered:int = -1;
}

root_type Reply;
Loading