Lot of improvements over a long weekend. See commit description for details. (#55)

* Decrease buffered queue size

* Reapply "Fix BufferedPacketQueue + test"

This reverts commit a66ffa3.

* Update Devourer and WFB

* Many stability fixes

Many fixes related to adaptive link and non-adaptive link usage.
Fixed crashes on application minimization
Adaptive link now starts faster
Channel change is possible without restart

* [MINOR] Remove unneeded declaration

Author: vertexodessa

app/src/main/java/com/openipc/pixelpilot/VideoActivity.java

@@ -245,6 +245,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // WFB-NG Setup
         initializeWfbNg();
 
+        // Options like tx power must be initialized explicitly
+        initDefaultOptions();
+
         // Video Player(s) Setup
         initializeVideoPlayers();
 
@@ -674,9 +677,7 @@ private void setupAdaptiveLinkSubMenu(PopupMenu popup) {
 
         SharedPreferences prefs = getSharedPreferences("general", MODE_PRIVATE);
         boolean adaptiveEnabled = prefs.getBoolean("adaptive_link_enabled", true);
-        int adaptiveTxPower = prefs.getInt("adaptive_tx_power", 30);
-         wfbLink.nativeSetAdaptiveLinkEnabled(adaptiveEnabled);
-         wfbLink.nativeSetTxPower(adaptiveTxPower);
+        int adaptiveTxPower = prefs.getInt("adaptive_tx_power", 20);
 
         // Adaptive link Enable option
         MenuItem adaptiveEnable = adaptiveMenu.add("Enable");
@@ -718,6 +719,14 @@ private void setupAdaptiveLinkSubMenu(PopupMenu popup) {
         }
     }
 
+    void initDefaultOptions(){
+        SharedPreferences prefs = getSharedPreferences("general", MODE_PRIVATE);
+        boolean adaptiveEnabled = prefs.getBoolean("adaptive_link_enabled", true);
+        int adaptiveTxPower = prefs.getInt("adaptive_tx_power", 20);
+        wfbLink.nativeSetAdaptiveLinkEnabled(adaptiveEnabled);
+        wfbLink.nativeSetTxPower(adaptiveTxPower);
+    }
+
     /**
      * Submenu for recording options, including start/stop DVR and toggling fMP4.
      */
@@ -1190,11 +1199,11 @@ protected void onResume() {
         wfbLinkManager.refreshAdapters();
 
         wfbLinkManager.startAdapters();
+        videoPlayer.start();
+        videoPlayer.startAudio();
 
         osdManager.restoreOSDConfig();
 
-        videoPlayer.start();
-        videoPlayer.startAudio();
 
         super.onResume();
     }

app/videonative/src/main/cpp/BufferedPacketQueue.h

@@ -1,21 +1,28 @@
+#if defined(__ANDROID__) || defined(__ANDROID_API__)
 #include <android/log.h>
+#else
+#include <cassert>
+#include <cstdio>
+#endif
 #include <algorithm>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
+
 #include <unordered_map>
 #include <vector>
 
 // Define logging tag and maximum buffer size
 #define BUFFERED_QUEUE_LOG_TAG "BufferedPacketQueue"
-// Considering the packet rate about 1000 packets per second, 100 packets should be enough
-constexpr size_t MAX_BUFFER_SIZE = 50;
+// Considering the packet rate about 100 packets per second, 10 packets should be enough
+constexpr size_t MAX_BUFFER_SIZE = 5;
 // Number of monotonically increasing packets
-constexpr size_t MONOTONIC_THRESHOLD = 40;
+constexpr size_t MONOTONIC_THRESHOLD = 3;
 
 // Type definition for sequence numbers
-using SeqType = uint16_t;
+using SeqType   = uint16_t;
+using SignedSeq = std::make_signed_t<SeqType>;
 
 /**
  * @brief BufferedPacketQueue class handles packet processing with sequence numbers,
@@ -104,7 +111,10 @@ class BufferedPacketQueue
      * @param currPacketIdx Sequence index of the incoming packet.
      * @return True if it's the next expected packet; otherwise, false.
      */
-    bool isNextExpectedPacket(SeqType currPacketIdx) const { return currPacketIdx == mLastPacketIdx + 1; }
+    bool isNextExpectedPacket(SeqType currPacketIdx) const
+    {
+        return currPacketIdx == static_cast<SeqType>(mLastPacketIdx + 1);
+    }
 
     /**
      * @brief Processes an in-order packet by invoking the callback and updating state.
@@ -170,8 +180,8 @@ class BufferedPacketQueue
 
         if (isDuplicatePacket(currPacketIdx))
         {
-            logWarning("Duplicate packet received with Sequence=%u. Ignoring.", currPacketIdx);
-            return;
+            logWarning("Duplicate packet received with Sequence=%u. ", currPacketIdx);
+            // return;
         }
 
         bufferPacket(currPacketIdx, data, data_length);
@@ -312,11 +322,20 @@ class BufferedPacketQueue
      */
     void logDebug(const char* format, ...) const
     {
+#if defined(__ANDROID__) || defined(__ANDROID_API__)
         return;
         va_list args;
         va_start(args, format);
         __android_log_vprint(ANDROID_LOG_DEBUG, BUFFERED_QUEUE_LOG_TAG, format, args);
         va_end(args);
+#else
+        // Fallback to standard output for non-Android platforms
+        va_list args;
+        va_start(args, format);
+        vfprintf(stderr, format, args);
+        va_end(args);
+        fprintf(stderr, "\n");
+#endif
     }
 
     /**
@@ -326,9 +345,18 @@ class BufferedPacketQueue
      */
     void logWarning(const char* format, ...) const
     {
+#if defined(__ANDROID__) || defined(__ANDROID_API__)
         va_list args;
         va_start(args, format);
         __android_log_vprint(ANDROID_LOG_WARN, BUFFERED_QUEUE_LOG_TAG, format, args);
         va_end(args);
+#else
+        // Fallback to standard output for non-Android platforms
+        va_list args;
+        va_start(args, format);
+        vfprintf(stderr, format, args);
+        va_end(args);
+        fprintf(stderr, "\n");
+#endif
     }
 };

app/videonative/src/main/cpp/tests/BufferedPacketQueue_test.cpp

@@ -0,0 +1,65 @@
+#include "BufferedPacketQueue.h"  // the class under test
+#include <gtest/gtest.h>
+#include <cstdint>
+#include <vector>
+
+// ---------- Test fixture ----------------------------------------------------
+class BufferedPacketQueueTest : public ::testing::Test
+{
+  protected:
+    BufferedPacketQueue   q;
+    std::vector<uint16_t> delivered;
+
+    void SetUp() override { delivered.clear(); }
+
+    /* Helper: feed one packet and record what the queue actually delivers. */
+    void feed(uint16_t seq)
+    {
+        uint16_t dummy = seq;
+
+        auto cb = [this](const uint8_t* seq, std::size_t)
+        {
+            std::cout << "Delivered packet with sequence: " << *(uint16_t*) seq << std::endl;
+            delivered.push_back(*(uint16_t*) seq);
+        };
+
+        q.processPacket(seq, (uint8_t*) &dummy, 2, cb);
+    }
+};
+
+// ---------- The reproduction test ------------------------------------------
+TEST_F(BufferedPacketQueueTest, WrapAroundDelivers)
+{
+    feed(65534);
+    feed(65535);
+    ASSERT_EQ(delivered, (std::vector<uint16_t>{65534, 65535}));
+
+    for (uint16_t s = 0; s < 25; ++s) feed(s);
+
+    std::vector<uint16_t> expected = {65534, 65535};
+    for (uint16_t s = 0; s < 25; ++s) expected.push_back(s);
+
+    ASSERT_EQ(delivered, expected) << "Overflow flush should deliver the entire block in one shot";
+}
+
+TEST_F(BufferedPacketQueueTest, ReorderedDeliversInOrder)
+{
+    feed(65533);
+    feed(65535);
+    feed(65534);
+    ASSERT_EQ(delivered, (std::vector<uint16_t>{65533, 65534, 65535}));
+
+    for (uint16_t s = 0; s < 25; ++s) feed(s);
+
+    std::vector<uint16_t> expected = {65533, 65534, 65535};
+    for (uint16_t s = 0; s < 25; ++s) expected.push_back(s);
+
+    ASSERT_EQ(delivered, expected) << "Overflow flush should deliver the entire block in one shot";
+}
+
+// ---------- gtest boilerplate main -----------------------------------------
+int main(int argc, char** argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}

app/videonative/src/main/cpp/tests/CMakeLists.txt

@@ -0,0 +1,41 @@
+# CMakeLists.txt — build + run the unit test
+#
+# Requires CMake ≥ 3.14 (for FetchContent) and a C++17 toolchain.
+
+cmake_minimum_required(VERSION 3.14)
+project(BufferedPacketQueueTests LANGUAGES CXX)
+
+# ---------- Toolchain basics -------------------------------------------------
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS  OFF)
+
+# ---------- GoogleTest (fetched at configure time) ---------------------------
+include(FetchContent)
+
+FetchContent_Declare(
+  googletest
+  URL  https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
+)
+# Keep GoogleTest from messing with CRT flags on MSVC
+set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
+enable_testing()
+
+# ---------- Test executable --------------------------------------------------
+add_executable(queue_test
+    BufferedPacketqueue_test.cpp
+)
+
+target_include_directories(queue_test PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+)
+target_link_libraries(queue_test
+    GTest::gtest_main
+)
+
+# Discover and register the test with CTest
+include(GoogleTest)
+gtest_discover_tests(queue_test)

app/wfbngrtl8812/src/main/cpp/SignalQualityCalculator.cpp

@@ -96,7 +96,7 @@ SignalQualityCalculator::SignalQuality SignalQualityCalculator::calculate_signal
 
     //    __android_log_print(ANDROID_LOG_ERROR, "DEBUG", "FEC RECOVERED %d, FEC_LOST %d", p_recovered, p_lost);
 
-    float quality = avg_rssi - static_cast<float>(p_recovered) * 12.f - static_cast<float>(p_lost) * 40.f;
+    float quality = avg_rssi; // - static_cast<float>(p_recovered) * 12.f - static_cast<float>(p_lost) * 40.f;
     quality = std::max(-1024.f, std::min(1024.f, quality));
 
     ret.quality = quality;