Merge pull request #38 from GuiDev1994/release/v1.1.3

Release v1.1.3

Author: GuiDev1994

.gitmodules

@@ -12,7 +12,7 @@
 	url = https://github.com/ThrowTheSwitch/Unity.git
 [submodule "third_party/ss4s"]
 	path = third_party/ss4s
-	url = https://github.com/mariotaku/ss4s.git
+	url = https://github.com/GuiDev1994/ss4s.git
 [submodule "third_party/commons"]
 	path = third_party/commons
 	url = https://github.com/GuiDev1994/commons-c.git

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.19)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
 
-set(MOONLIGHT_VERSION "1.1.2")
+set(MOONLIGHT_VERSION "1.1.3")
 
 project(moonlight VERSION ${MOONLIGHT_VERSION} LANGUAGES C CXX)
 

src/app/app_settings.c

@@ -39,7 +39,29 @@ void settings_reconcile_refresh_rate(app_settings_t *config) {
 #if defined(TARGET_WEBOS)
     int ntsc = settings_ntsc_refresh_rate_x100_for_fps(config->stream.fps);
     if (ntsc > 0) {
-        config->client_refresh_rate_x100 = ntsc;
+        if (config->use_ntsc_refresh) {
+            /* Auto NTSC for presets; keep a user Custom FPS fractional rate if present. */
+            if (config->client_refresh_rate_x100 == 0 ||
+                config->client_refresh_rate_x100 == ntsc) {
+                config->client_refresh_rate_x100 = ntsc;
+                return;
+            }
+            int implied = (config->client_refresh_rate_x100 + 50) / 100;
+            if (implied != config->stream.fps) {
+                config->client_refresh_rate_x100 = ntsc;
+            }
+            return;
+        }
+        /* Integer presets: clear auto-NTSC; keep a distinct Custom FPS fractional rate. */
+        if (config->client_refresh_rate_x100 == 0 ||
+            config->client_refresh_rate_x100 == ntsc) {
+            config->client_refresh_rate_x100 = 0;
+            return;
+        }
+        int implied = (config->client_refresh_rate_x100 + 50) / 100;
+        if (implied != config->stream.fps) {
+            config->client_refresh_rate_x100 = 0;
+        }
         return;
     }
 #endif
@@ -77,7 +99,16 @@ int settings_ntsc_refresh_rate_x100_for_fps(int nominal_fps)
 void settings_apply_ntsc_preset_refresh(app_settings_t *config, int nominal_fps)
 {
 #if defined(TARGET_WEBOS)
+    if (!config) {
+        return;
+    }
     (void) nominal_fps;
+    int ntsc = settings_ntsc_refresh_rate_x100_for_fps(config->stream.fps);
+    if (ntsc > 0) {
+        /* Preset selection / NTSC checkbox: force auto NTSC or integer (clears Custom). */
+        config->client_refresh_rate_x100 = config->use_ntsc_refresh ? ntsc : 0;
+        return;
+    }
     settings_reconcile_refresh_rate(config);
 #else
     (void) config;
@@ -128,11 +159,17 @@ void settings_initialize(app_settings_t *config, char *conf_dir) {
     config->hdr = false;
     config->force_full_color_range = false;
     config->hevc = true;
-    config->idr_refresh_interval_sec = 0;
+    config->idr_refresh_interval_ms = 0;
     config->show_stats_on_start = false;
     config->show_stats_compact = false;
     config->stick_deadzone = 7;
     config->client_refresh_rate_x100 = 0;
+    config->use_ntsc_refresh = false;
+#if defined(TARGET_WEBOS)
+    config->smooth_frame_pacing = true;
+#else
+    config->smooth_frame_pacing = false;
+#endif
     config->auto_adjust_bitrate = false;
     config->abr_mode = 0;
 
@@ -199,10 +236,12 @@ bool settings_save(app_settings_t *config) {
     ini_write_bool(fp, "hdr", config->hdr);
     ini_write_bool(fp, "force_full_color_range", config->force_full_color_range);
     ini_write_bool(fp, "hevc", config->hevc);
-    ini_write_int(fp, "idr_refresh_interval_sec", config->idr_refresh_interval_sec);
+    ini_write_int(fp, "idr_refresh_interval_ms", config->idr_refresh_interval_ms);
     ini_write_bool(fp, "show_stats_on_start", config->show_stats_on_start);
     ini_write_bool(fp, "show_stats_compact", config->show_stats_compact);
     ini_write_int(fp, "client_refresh_rate_x100", config->client_refresh_rate_x100);
+    ini_write_bool(fp, "use_ntsc_refresh", config->use_ntsc_refresh);
+    ini_write_bool(fp, "smooth_frame_pacing", config->smooth_frame_pacing);
 
     ini_write_section(fp, "audio");
     ini_write_string(fp, "backend", config->audio_backend);
@@ -297,14 +336,33 @@ static int settings_parse(app_settings_t *config, const char *section, const cha
         if (config->abr_mode < 0 || config->abr_mode > 2) {
             config->abr_mode = 0;
         }
+    } else if (INI_FULL_MATCH("video", "idr_refresh_interval_ms")) {
+        set_int(&config->idr_refresh_interval_ms, value);
+        if (config->idr_refresh_interval_ms < 0) {
+            config->idr_refresh_interval_ms = 0;
+        } else if (config->idr_refresh_interval_ms > 0 && config->idr_refresh_interval_ms < 500) {
+            config->idr_refresh_interval_ms = 500;
+        } else if (config->idr_refresh_interval_ms > 60000) {
+            config->idr_refresh_interval_ms = 60000;
+        } else if (config->idr_refresh_interval_ms > 0) {
+            config->idr_refresh_interval_ms = ((config->idr_refresh_interval_ms + 250) / 500) * 500;
+            if (config->idr_refresh_interval_ms < 500) {
+                config->idr_refresh_interval_ms = 500;
+            }
+        }
     } else if (INI_FULL_MATCH("video", "idr_refresh_interval_sec")) {
-        set_int(&config->idr_refresh_interval_sec, value);
-        if (config->idr_refresh_interval_sec < 0) {
-            config->idr_refresh_interval_sec = 0;
-        } else if (config->idr_refresh_interval_sec > 60) {
-            config->idr_refresh_interval_sec = 60;
-        } else if (config->idr_refresh_interval_sec == 1) {
-            config->idr_refresh_interval_sec = 2;
+        /* Legacy seconds key → milliseconds */
+        int sec = 0;
+        set_int(&sec, value);
+        if (sec < 0) {
+            config->idr_refresh_interval_ms = 0;
+        } else if (sec == 0) {
+            config->idr_refresh_interval_ms = 0;
+        } else {
+            if (sec > 60) {
+                sec = 60;
+            }
+            config->idr_refresh_interval_ms = sec * 1000;
         }
     } else if (INI_NAME_MATCH("hevc")) {
         config->hevc = INI_IS_TRUE(value);
@@ -325,6 +383,10 @@ static int settings_parse(app_settings_t *config, const char *section, const cha
         } else if (config->client_refresh_rate_x100 > 24000) {
             config->client_refresh_rate_x100 = 24000;
         }
+    } else if (INI_FULL_MATCH("video", "use_ntsc_refresh")) {
+        config->use_ntsc_refresh = INI_IS_TRUE(value);
+    } else if (INI_FULL_MATCH("video", "smooth_frame_pacing")) {
+        config->smooth_frame_pacing = INI_IS_TRUE(value);
     } else if (INI_FULL_MATCH("video", "force_full_color_range")) {
         config->force_full_color_range = INI_IS_TRUE(value);
     } else if (INI_NAME_MATCH("surround")) {

src/app/app_settings.h

@@ -51,8 +51,8 @@ typedef struct app_settings_t {
     bool hdr;   /* HDR10 (PQ) over HEVC Main10 when host and decoder support it */
     bool force_full_color_range; /* SDR only: request full-range YUV (0-255) from host. No effect when HDR is on. */
     bool hevc;
-    /** Periodic HEVC IDR refresh interval in seconds (0 = off, min 2 when enabled). */
-    int idr_refresh_interval_sec;
+    /** Periodic HEVC IDR refresh interval in ms (0 = off, min 500 when enabled, step 500). */
+    int idr_refresh_interval_ms;
     bool show_stats_on_start;
     bool show_stats_compact;
     int stick_deadzone;
@@ -61,6 +61,17 @@ typedef struct app_settings_t {
      * 0 = omit (host default frame pacing).
      */
     int client_refresh_rate_x100;
+    /**
+     * When true on webOS, map preset 30/60/120/240 fps to NTSC fractional rates
+     * (e.g. 120 → 11988). When false, presets use integer fps (client_refresh_rate_x100 = 0).
+     */
+    bool use_ntsc_refresh;
+    /**
+     * webOS NDL/SMP: stamp video PTS on a virtual frame grid instead of wall-clock feed time.
+     * Reduces pan hitching when encode/arrival jitter is high (default true).
+     * When enabled, host presentationTimeUs is mapped into the player PTS when available.
+     */
+    bool smooth_frame_pacing;
     bool auto_adjust_bitrate;
     int abr_mode;
     char *conf_dir;
@@ -104,13 +115,13 @@ bool settings_save(app_settings_t *config);
 /** Keep stream.fps aligned with client_refresh_rate_x100 when a fractional rate is set. */
 void settings_sync_refresh_rate(app_settings_t *config);
 
-/** webOS: apply NTSC x100 only for 30/60/120/240; drop stale x100 for 144/90/etc. */
+/** webOS: apply NTSC x100 only when use_ntsc_refresh for 30/60/120/240; else clear for presets. */
 void settings_reconcile_refresh_rate(app_settings_t *config);
 
 /** NTSC refresh rate (Hz × 100) for a nominal FPS preset, or 0 if not mapped (e.g. 144). */
 int settings_ntsc_refresh_rate_x100_for_fps(int nominal_fps);
 
-/** On webOS, set client_refresh_rate_x100 from a preset FPS (60→5994, 120→11988, …). */
+/** On webOS, set or clear client_refresh_rate_x100 for a preset FPS based on use_ntsc_refresh. */
 void settings_apply_ntsc_preset_refresh(app_settings_t *config, int nominal_fps);
 
 void settings_clear(app_settings_t *config);

src/app/lvgl/input/lv_sdl_drv_wheel_input.c

@@ -28,6 +28,45 @@ static bool wheel_handle_gridview(app_ui_input_t *input, const SDL_MouseWheelEve
     return true;
 }
 
+/**
+ * Scroll the nearest vertical scrollable ancestor of the focused object.
+ * Prevents Magic Remote / mouse wheel from driving LVGL encoder focus navigation
+ * on settings panes and host lists.
+ */
+static bool wheel_handle_scrollable(app_ui_input_t *input, const SDL_MouseWheelEvent *wheel) {
+    if (wheel->y == 0) {
+        return false;
+    }
+    lv_group_t *group = app_input_get_group(input);
+    if (group == NULL) {
+        return false;
+    }
+    lv_obj_t *focused = lv_group_get_focused(group);
+    if (focused == NULL) {
+        return false;
+    }
+
+    lv_obj_t *scrollable = focused;
+    while (scrollable != NULL) {
+        if (lv_obj_has_flag(scrollable, LV_OBJ_FLAG_SCROLLABLE)) {
+            const lv_dir_t dir = lv_obj_get_scroll_dir(scrollable);
+            if (dir & LV_DIR_VER) {
+                const lv_coord_t overflow =
+                        lv_obj_get_scroll_top(scrollable) + lv_obj_get_scroll_bottom(scrollable);
+                if (overflow > 0) {
+                    /* SDL: y > 0 = away (scroll up). LVGL: positive dy scrolls content down. */
+                    const lv_coord_t step = LV_MAX(lv_dpx(48), lv_obj_get_height(scrollable) / 6);
+                    const lv_coord_t dy = (wheel->y > 0) ? -step : step;
+                    lv_obj_scroll_by_bounded(scrollable, 0, dy, LV_ANIM_ON);
+                    return true;
+                }
+            }
+        }
+        scrollable = lv_obj_get_parent(scrollable);
+    }
+    return false;
+}
+
 int lv_sdl_init_wheel(lv_indev_drv_t *drv, app_ui_input_t *input) {
     lv_indev_drv_init(drv);
     drv->user_data = input;
@@ -48,6 +87,8 @@ static void sdl_input_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
             session_handle_input_event(app->session, &e);
         } else if (wheel_handle_gridview(input, &e.wheel)) {
             /* Page the game grid; do not move group focus or scroll parents. */
+        } else if (wheel_handle_scrollable(input, &e.wheel)) {
+            /* Scroll settings / host lists instead of changing focus. */
         } else if (e.wheel.y != 0) {
             /* Encoder scroll only: never set PRESSED — that triggers LVGL "encoder button" clicks. */
             data->enc_diff = (e.wheel.y > 0) ? -1 : 1;

src/app/stream/session_worker.c

@@ -12,6 +12,36 @@
 #include "stream/adaptive_bitrate.h"
 #include "app_session.h"
 #include "backend/pcmanager/worker/worker.h"
+#include "app_settings.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+static void session_apply_smooth_pacing_env(const session_t *session) {
+#if TARGET_WEBOS
+    const app_settings_t *cfg = app_configuration;
+    bool smooth = cfg != NULL ? cfg->smooth_frame_pacing : true;
+    const char *smooth_val = smooth ? "1" : "0";
+    /* Shared names for SMP + NDL; keep NDL_* aliases for older module builds. */
+    setenv("SS4S_SMOOTH_PACING", smooth_val, 1);
+    setenv("SS4S_NDL_SMOOTH_PACING", smooth_val, 1);
+
+    int x100 = session->config.stream.clientRefreshRateX100;
+    if (x100 > 0) {
+        /* interval_us = 1e6 * 100 / x100  (e.g. 11988 → ~8341 µs) */
+        long interval_us = (100000000L + (x100 / 2)) / x100;
+        char buf[32];
+        snprintf(buf, sizeof(buf), "%ld", interval_us);
+        setenv("SS4S_SMOOTH_PACING_INTERVAL_US", buf, 1);
+        setenv("SS4S_NDL_PACING_INTERVAL_US", buf, 1);
+    } else {
+        unsetenv("SS4S_SMOOTH_PACING_INTERVAL_US");
+        unsetenv("SS4S_NDL_PACING_INTERVAL_US");
+    }
+#else
+    (void) session;
+#endif
+}
 
 int session_worker(session_t *session) {
     app_t *app = session->app;
@@ -73,6 +103,7 @@ int session_worker(session_t *session) {
     SS4S_PlayerSetViewportSize(session->player, app->ui.width, app->ui.height);
     SS4S_PlayerSetUserdata(session->player, app);
 
+    session_apply_smooth_pacing_env(session);
     session_video_prepare_stream();
 
     int startResult = LiStartConnection(&server->serverInfo, &session->config.stream,