Refactoring of FEC management class

Author: vertexodessa

app/wfbngrtl8812/src/main/cpp/FecChangeController.h

@@ -0,0 +1,73 @@
+#pragma once
+
+#include <mutex>
+#include <chrono>
+#include <android/log.h>
+
+class FecChangeController
+{
+    static constexpr const char *TAG = "FecChangeController";
+public:
+    /// \brief Query the current (possibly decayed) fec_change value.
+    ///        Call this as often as you like; the class handles its own timing.
+    int value()
+    {
+        if (!mEnabled)
+            return 0;
+
+        std::lock_guard<std::mutex> lock(mx_);
+        decayLocked_();
+        return val_;
+    }
+
+    /// \brief Raise fec_change.  If newValue <= current, the call is ignored.
+    ///        A successful bump resets the 5-second “hold” timer.
+    void bump(int newValue)
+    {
+        std::lock_guard<std::mutex> lock(mx_);
+        if (newValue > val_) {
+            __android_log_print(ANDROID_LOG_ERROR, TAG, "bumping FEC: %d", newValue);
+
+            val_        = newValue;
+            lastChange_ = Clock::now();
+        }
+    }
+
+    void setEnabled(bool use){
+        mEnabled = use;
+    }
+
+private:
+    using Clock = std::chrono::steady_clock;
+    static constexpr std::chrono::seconds kTick{1};   // length of one hold/decay window
+
+    void decayLocked_()
+    {
+        if (val_ == 0) return;
+
+        auto now     = Clock::now();
+        auto elapsed = now - lastChange_;
+
+        // Still inside the mandatory 5-second hold?  Do nothing.
+        if (elapsed < kTick) return;
+
+        // How many *full* ticks have passed since lastChange_?
+        auto ticks = std::chrono::duration_cast<std::chrono::seconds>(elapsed).count() / kTick.count();
+        if (ticks == 0) return;   // safety net (shouldn’t hit)
+
+        int decayed = val_ - static_cast<int>(ticks);
+        if (decayed < 0) decayed = 0;
+
+        // Commit the decay and anchor lastChange_ on the most recent tick boundary
+        if (decayed != val_) {
+            val_        = decayed;
+            lastChange_ += kTick * ticks;
+        }
+    }
+
+    int                   val_        {0};
+    Clock::time_point     lastChange_ {Clock::now()};
+    std::mutex            mx_;
+    bool mEnabled = true;
+};
+

app/wfbngrtl8812/src/main/cpp/WfbngLink.cpp

@@ -65,7 +65,7 @@ void WfbngLink::initAgg() {
     video_channel_id_be = htobe32(video_channel_id_f);
     auto udsName = std::string("my_socket");
 
-    video_aggregator = std::make_unique<AggregatorUNIX>(udsName, keyPath, epoch, video_channel_id_f, 0);
+    video_aggregator = std::make_unique<AggregatorUDPv4>(client_addr, 5600, keyPath, epoch, video_channel_id_f, 0);
 
     int mavlink_client_port = 14550;
     uint8_t mavlink_radio_port = 0x10;
@@ -392,76 +392,6 @@ extern "C" JNIEXPORT void JNICALL Java_com_openipc_wfbngrtl8812_WfbNgLink_native
     native(wfbngLinkN)->initAgg();
 }
 
-
-class FecChangeController
-{
-public:
-    /// \brief Query the current (possibly decayed) fec_change value.
-    ///        Call this as often as you like; the class handles its own timing.
-    int value()
-    {
-        if (!mEnabled)
-            return 0;
-
-        std::lock_guard<std::mutex> lock(mx_);
-        decayLocked_();
-        return val_;
-    }
-
-    /// \brief Raise fec_change.  If newValue <= current, the call is ignored.
-    ///        A successful bump resets the 5-second “hold” timer.
-    void bump(int newValue)
-    {
-        std::lock_guard<std::mutex> lock(mx_);
-        if (newValue > val_) {
-            __android_log_print(ANDROID_LOG_ERROR, TAG, "bumping FEC: %d", newValue);
-
-            val_        = newValue;
-            lastChange_ = Clock::now();
-        }
-    }
-
-    void setEnabled(bool use){
-        mEnabled = use;
-    }
-
-private:
-    using Clock = std::chrono::steady_clock;
-    static constexpr std::chrono::seconds kTick{1};   // length of one hold/decay window
-
-    void decayLocked_()
-    {
-        if (val_ == 0) return;
-
-        auto now     = Clock::now();
-        auto elapsed = now - lastChange_;
-
-        // Still inside the mandatory 5-second hold?  Do nothing.
-        if (elapsed < kTick) return;
-
-        // How many *full* ticks have passed since lastChange_?
-        auto ticks = std::chrono::duration_cast<std::chrono::seconds>(elapsed).count() / kTick.count();
-        if (ticks == 0) return;   // safety net (shouldn’t hit)
-
-        int decayed = val_ - static_cast<int>(ticks);
-        if (decayed < 0) decayed = 0;
-
-        // Commit the decay and anchor lastChange_ on the most recent tick boundary
-        if (decayed != val_) {
-            val_        = decayed;
-            lastChange_ += kTick * ticks;
-        }
-    }
-
-    int                   val_        {0};
-    Clock::time_point     lastChange_ {Clock::now()};
-    std::mutex            mx_;
-    bool mEnabled = true;
-};
-
-
-FecChangeController fec;
-
 // Modified start_link_quality_thread: use adaptive_link_enabled and adaptive_tx_power
 void WfbngLink::start_link_quality_thread(int fd) {
     auto thread_func = [this, fd]() {
@@ -567,7 +497,7 @@ void WfbngLink::start_link_quality_thread(int fd) {
                 len = strlen(message + sizeof(len));
                 len = htonl(len);
                 memcpy(message, &len, sizeof(len));
-                __android_log_print(ANDROID_LOG_ERROR, TAG, "message %s", message + 4);
+                __android_log_print(ANDROID_LOG_ERROR, TAG, " message %s", message + 4);
                 ssize_t sent = sendto(sockfd,
                                       message,
                                       strlen(message + sizeof(len)) + sizeof(len),
@@ -633,5 +563,6 @@ extern "C" JNIEXPORT void JNICALL Java_com_openipc_wfbngrtl8812_WfbNgLink_native
                                                                                            jclass clazz,
                                                                                           jlong wfbngLinkN,
                                                                                           jint use) {
-    fec.setEnabled(use);
+    WfbngLink *link = native(wfbngLinkN);
+    link->fec.setEnabled(use);
 }

app/wfbngrtl8812/src/main/cpp/WfbngLink.hpp

@@ -1,12 +1,14 @@
 #ifndef FPV_VR_WFBNG_LINK_H
 #define FPV_VR_WFBNG_LINK_H
 
+#include "FecChangeController.h"
 #include "TxFrame.h"
+#include "SignalQualityCalculator.h"
+
 extern "C" {
 #include "wfb-ng/src/fec.h"
 }
 
-#include "SignalQualityCalculator.h"
 #include "devourer/src/WiFiDriver.h"
 #include "wfb-ng/src/rx.hpp"
 #include <jni.h>
@@ -28,7 +30,7 @@ class WfbngLink {
     void stop(JNIEnv *env, jobject androidContext, jint fd);
 
     std::mutex agg_mutex;
-    std::unique_ptr<AggregatorUNIX> video_aggregator;
+    std::unique_ptr<AggregatorUDPv4> video_aggregator;
     std::unique_ptr<AggregatorUDPv4> mavlink_aggregator;
     std::unique_ptr<AggregatorUDPv4> udp_aggregator;
 
@@ -43,6 +45,7 @@ class WfbngLink {
     std::map<int, std::unique_ptr<Rtl8812aDevice>> rtl_devices;
     std::unique_ptr<std::thread> link_quality_thread{nullptr};
     bool should_clear_stats{false};
+    FecChangeController fec;
 
     void init_thread(std::unique_ptr<std::thread> &thread,
                      const std::function<std::unique_ptr<std::thread>()> &init_func) {