Merge branch 'rpi-eventloop'

.gitignore

@@ -4,3 +4,6 @@ build/
 .cache/
 *.AppImage
 squashfs-root/
+
+buildpi/
+rpi-ffmpeg/

CMakeLists.txt

@@ -8,11 +8,19 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set(CMAKE_C_STANDARD 23)
 
-add_subdirectory(lib)
+OPTION(VANILLA_BUILD_DESKTOP "Build Qt app for Linux desktop" ON)
+OPTION(VANILLA_BUILD_RPI "Build SDL2 app for Raspberry Pi" OFF)
+OPTION(VANILLA_BUILD_TESTS "Build unit tests for Vanilla" OFF)
 
+add_subdirectory(lib)
 if (NOT ANDROID)
 	add_subdirectory(pipe)
 endif()
-
-add_subdirectory(app)
+if (VANILLA_BUILD_DESKTOP)
+    add_subdirectory(app)
+endif()
+if (VANILLA_BUILD_RPI)
+    add_subdirectory(rpi)
+endif()

app/backend.cpp

@@ -14,20 +14,22 @@
 #include <unistd.h>
 #include <vanilla.h>
 
-void vanillaEventHandler(void *context, int type, const char *data, size_t dataLength)
-{
-    Backend *backend = static_cast<Backend*>(context);
-
-    switch (type) {
-    case VANILLA_EVENT_VIDEO:
-        emit backend->videoAvailable(QByteArray(data, dataLength));
-        break;
-    case VANILLA_EVENT_AUDIO:
-        emit backend->audioAvailable(QByteArray(data, dataLength));
-        break;
-    case VANILLA_EVENT_VIBRATE:
-        emit backend->vibrate(*data);
-        break;
+void Backend::vanillaEventHandler()
+{
+    vanilla_event_t event;
+
+    while (vanilla_wait_event(&event)) {
+        switch (event.type) {
+        case VANILLA_EVENT_VIDEO:
+            emit videoAvailable(QByteArray((const char *) event.data, event.size));
+            break;
+        case VANILLA_EVENT_AUDIO:
+            emit audioAvailable(QByteArray((const char *) event.data, event.size));
+            break;
+        case VANILLA_EVENT_VIBRATE:
+            emit vibrate(*event.data);
+            break;
+        }
     }
 }
 
@@ -70,12 +72,13 @@ int Backend::syncInternal(uint16_t code)
 
 void Backend::connectToConsole()
 {
-    QtConcurrent::run(&Backend::connectInternal, this);
+    connectInternal();
+    QtConcurrent::run(&Backend::vanillaEventHandler, this);
 }
 
 int Backend::connectInternal()
 {
-    return vanilla_start(vanillaEventHandler, this);
+    return vanilla_start(0);
 }
 
 void Backend::updateTouch(int x, int y)
@@ -175,7 +178,7 @@ int BackendViaInternalPipe::syncInternal(uint16_t code)
 
 int BackendViaInternalPipe::connectInternal()
 {
-    return vanilla_start_udp(vanillaEventHandler, this, QHostAddress(QHostAddress::LocalHost).toIPv4Address());
+    return vanilla_start(QHostAddress(QHostAddress::LocalHost).toIPv4Address());
 }
 
 BackendViaExternalPipe::BackendViaExternalPipe(const QHostAddress &udpServer, QObject *parent) : Backend(parent)
@@ -190,5 +193,5 @@ int BackendViaExternalPipe::syncInternal(uint16_t code)
 
 int BackendViaExternalPipe::connectInternal()
 {
-    return vanilla_start_udp(vanillaEventHandler, this, m_serverAddress.toIPv4Address());
+    return vanilla_start(m_serverAddress.toIPv4Address());
 }

app/backend.h

@@ -75,6 +75,8 @@ public slots:
 private slots:
     void syncFutureCompleted();
 
+    void vanillaEventHandler();
+
 };
 
 class BackendViaInternalPipe : public Backend

docker/rpi/Dockerfile

@@ -0,0 +1,7 @@
+FROM --platform=linux/arm/v6 arm32v6/alpine
+
+RUN apk update
+RUN apk upgrade
+RUN apk add build-base cmake libnl3-dev openssl-dev sdl2-dev linux-headers ffmpeg-dev eudev-dev
+
+CMD [ "make", "-j32", "-C", "/data/buildpi" ]

lib/CMakeLists.txt

@@ -20,3 +20,12 @@ if (NOT ANDROID)
 endif()
 
 install(TARGETS vanilla)
+
+if (VANILLA_BUILD_TESTS)
+    add_executable(bittest
+        test/bittest.c
+    )
+
+    target_link_libraries(bittest PRIVATE vanilla m)
+    target_include_directories(bittest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+endif()

lib/gamepad/audio.c

@@ -31,21 +31,24 @@ typedef struct {
     uint32_t video_format;
 } AudioPacketVideoFormat;
 
-void handle_audio_packet(vanilla_event_handler_t event_handler, void *context, char *data, size_t len)
+void handle_audio_packet(gamepad_context_t *ctx, unsigned char *data, size_t len)
 {
-    for (int byte = 0; byte < len; byte++) {
+    //
+    // === IMPORTANT NOTE! ===
+    //
+    // This for loop skips ap->format, ap->seq_id, and ap->timestamp to save processing.
+    // If you want those, you'll have to adjust this loop.
+    //
+    for (int byte = 0; byte < 4; byte++) {
         data[byte] = (unsigned char) reverse_bits(data[byte], 8);
     }
 
     AudioPacket *ap = (AudioPacket *) data;
 
-    ap->format = reverse_bits(ap->format, 3);
-    ap->seq_id = reverse_bits(ap->seq_id, 10);
+    // ap->format = reverse_bits(ap->format, 3);
+    // ap->seq_id = reverse_bits(ap->seq_id, 10);
     ap->payload_size = reverse_bits(ap->payload_size, 16);
-    ap->timestamp = reverse_bits(ap->timestamp, 32);
-    for (int byte = 0; byte < ap->payload_size; ++byte) {
-        ap->payload[byte] = (unsigned char) reverse_bits(ap->payload[byte], 8);
-    }
+    // ap->timestamp = reverse_bits(ap->timestamp, 32);
 
     if (ap->type == TYPE_VIDEO) {
         AudioPacketVideoFormat *avp = (AudioPacketVideoFormat *) ap->payload;
@@ -56,22 +59,24 @@ void handle_audio_packet(vanilla_event_handler_t event_handler, void *context, c
         return;
     }
 
-    event_handler(context, VANILLA_EVENT_AUDIO, ap->payload, ap->payload_size);
+    if (ap->payload_size) {
+        push_event(ctx->event_loop, VANILLA_EVENT_AUDIO, ap->payload, ap->payload_size);
+    }
 
     uint8_t vibrate_val = ap->vibrate;
-    event_handler(context, VANILLA_EVENT_VIBRATE, &vibrate_val, sizeof(vibrate_val));
+    push_event(ctx->event_loop, VANILLA_EVENT_VIBRATE, &vibrate_val, sizeof(vibrate_val));
 }
 
 void *listen_audio(void *x)
 {
-    struct gamepad_thread_context *info = (struct gamepad_thread_context *) x;
+    gamepad_context_t *info = (gamepad_context_t *) x;
     unsigned char data[2048];
     ssize_t size;
     do {
         size = recv(info->socket_aud, data, sizeof(data), 0);
         if (size > 0) {
             if (is_stop_code(data, size)) break;
-            handle_audio_packet(info->event_handler, info->context, data, size);
+            handle_audio_packet(info, data, size);
         }
     } while (!is_interrupted());
 

lib/gamepad/command.c

@@ -422,7 +422,7 @@ void handle_command_packet(int skt, CmdHeader *request)
 
 void *listen_command(void *x)
 {
-    struct gamepad_thread_context *info = (struct gamepad_thread_context *)x;
+    gamepad_context_t *info = (gamepad_context_t *)x;
 
     unsigned char data[sizeof(CmdHeader) + 2048];
     ssize_t size;