fix(server): 🐛 Fix IDR resend logic (#2403)

Co-authored-by: zarik5 <[email protected]>
alvr-org · Oct 5, 2024 · cf52f87 · cf52f87
1 parent ceae7d8
commit cf52f87
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 33 deletions.
diff --git a/alvr/server_core/src/connection.rs b/alvr/server_core/src/connection.rs
@@ -154,7 +154,7 @@ pub fn contruct_openvr_config(session: &SessionConfig) -> OpenvrConfig {
     OpenvrConfig {
         tracking_ref_only: settings.headset.tracking_ref_only,
         enable_vive_tracker_proxy: settings.headset.enable_vive_tracker_proxy,
-        aggressive_keyframe_resend: settings.connection.aggressive_keyframe_resend,
+        minimum_idr_interval_ms: settings.connection.minimum_idr_interval_ms,
         adapter_index: settings.video.adapter_index,
         codec: settings.video.preferred_codec as _,
         h264_profile: settings.video.encoder_config.h264_profile as u32,

diff --git a/alvr/server_openvr/cpp/alvr_server/IDRScheduler.cpp b/alvr/server_openvr/cpp/alvr_server/IDRScheduler.cpp
@@ -7,30 +7,11 @@ IDRScheduler::IDRScheduler() { }
 
 IDRScheduler::~IDRScheduler() { }
 
-void IDRScheduler::OnPacketLoss() {
-    std::unique_lock lock(m_mutex);
-
-    if (m_scheduled) {
-        // Waiting next insertion.
-        return;
-    }
-    if (GetTimestampUs() - m_insertIDRTime > m_minIDRFrameInterval) {
-        // Insert immediately
-        m_insertIDRTime = GetTimestampUs();
-        m_scheduled = true;
-    } else {
-        // Schedule next insertion.
-        m_insertIDRTime += m_minIDRFrameInterval;
-        m_scheduled = true;
-    }
-}
+void IDRScheduler::OnPacketLoss() { InsertIDR(); }
 
 void IDRScheduler::OnStreamStart() {
-    if (Settings::Instance().IsLoaded() && Settings::Instance().m_aggressiveKeyframeResend) {
-        m_minIDRFrameInterval = MIN_IDR_FRAME_INTERVAL_AGGRESSIVE;
-    } else {
-        m_minIDRFrameInterval = MIN_IDR_FRAME_INTERVAL;
-    }
+    m_minIDRFrameInterval = Settings::Instance().m_minimumIdrIntervalMs * 1000;
+    m_scheduled = false;
     InsertIDR();
 }
 

diff --git a/alvr/server_openvr/cpp/alvr_server/IDRScheduler.h b/alvr/server_openvr/cpp/alvr_server/IDRScheduler.h
@@ -18,8 +18,6 @@ class IDRScheduler {
 
 private:
     static const int MIN_IDR_FRAME_INTERVAL = 100 * 1000; // 100-milliseconds
-    static const int MIN_IDR_FRAME_INTERVAL_AGGRESSIVE
-        = 5 * 1000; // 5-milliseconds (less than screen refresh interval)
     uint64_t m_insertIDRTime = 0;
     bool m_scheduled = false;
     std::mutex m_mutex;

diff --git a/alvr/server_openvr/cpp/alvr_server/Settings.cpp b/alvr/server_openvr/cpp/alvr_server/Settings.cpp
@@ -105,7 +105,7 @@ void Settings::Load() {
         m_nvencEnableWeightedPrediction
             = config.get("nvenc_enable_weighted_prediction").get<bool>();
 
-        m_aggressiveKeyframeResend = config.get("aggressive_keyframe_resend").get<bool>();
+        m_minimumIdrIntervalMs = config.get("minimum_idr_interval_ms").get<int64_t>();
 
         m_enableViveTrackerProxy = config.get("enable_vive_tracker_proxy").get<bool>();
         m_TrackingRefOnly = config.get("tracking_ref_only").get<bool>();

diff --git a/alvr/server_openvr/cpp/alvr_server/Settings.h b/alvr/server_openvr/cpp/alvr_server/Settings.h
@@ -80,7 +80,7 @@ class Settings {
     int64_t m_nvencRcAverageBitrate;
     bool m_nvencEnableWeightedPrediction;
 
-    bool m_aggressiveKeyframeResend;
+    uint64_t m_minimumIdrIntervalMs;
 
     bool m_enableViveTrackerProxy = false;
     bool m_TrackingRefOnly = false;

diff --git a/alvr/session/src/lib.rs b/alvr/session/src/lib.rs
@@ -43,7 +43,7 @@ pub struct OpenvrConfig {
     pub target_eye_resolution_height: u32,
     pub tracking_ref_only: bool,
     pub enable_vive_tracker_proxy: bool,
-    pub aggressive_keyframe_resend: bool,
+    pub minimum_idr_interval_ms: u64,
     pub adapter_index: u32,
     pub codec: u8,
     pub h264_profile: u32,

diff --git a/alvr/session/src/settings.rs b/alvr/session/src/settings.rs
@@ -1090,11 +1090,10 @@ This could happen on TCP. A IDR frame is requested in this case."#
     #[schema(suffix = " frames")]
     pub statistics_history_size: usize,
 
-    #[schema(strings(
-        help = "Reduce minimum delay between IDR keyframes from 100ms to 5ms. Use on networks with high packet loss."
-    ))]
+    #[schema(strings(display_name = "Minimum IDR interval"))]
     #[schema(flag = "steamvr-restart")]
-    pub aggressive_keyframe_resend: bool,
+    #[schema(gui(slider(min = 5, max = 1000, step = 5)), suffix = "ms")]
+    pub minimum_idr_interval_ms: u64,
 
     pub dscp: Option<DscpTos>,
 }
@@ -1689,7 +1688,7 @@ pub fn session_settings_default() -> SettingsDefault {
             client_recv_buffer_bytes: socket_buffer,
             max_queued_server_video_frames: 1024,
             avoid_video_glitching: false,
-            aggressive_keyframe_resend: false,
+            minimum_idr_interval_ms: 100,
             on_connect_script: "".into(),
             on_disconnect_script: "".into(),
             packet_size: 1400,