settings.xml: add whole-number repeat mode

New TVs most support 120Hz, so add a new whole-number repeat option for 24/30Hz to 120Hz.
This allow judder free playback for 24/30Hz on 120Hz.

Author: Portisch

addons/resource.language.en_gb/resources/strings.po

@@ -8592,6 +8592,11 @@ msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#14128"
+msgid "Allow whole-number frame repeat"
+msgstr ""
+
+#: system/settings/settings.xml
+msgctxt "#14129"
 msgid "Allow double refresh rates"
 msgstr ""
 
@@ -21948,6 +21953,12 @@ msgstr ""
 #. Description of setting with label #14128 "Whitelist"
 #: system/settings/settings.xml
 msgctxt "#36445"
+msgid "Select this option to allow using whole-number repeat rate (playing 24 FPS video on a 120 Hz monitor or playing 30 FPS video on a 120 Hz monitor)."
+msgstr ""
+
+#. Description of setting with label #14129 "Whitelist"
+#: system/settings/settings.xml
+msgctxt "#36446"
 msgid "Select this option to allow using double refresh rates (playing 29.97 FPS video on a 59.94 Hz monitor or playing 30 FPS video on a 60 Hz monitor). You may want to use this option if your monitor doesn't have a 29.97 Hz or 30 Hz mode."
 msgstr ""
 

system/settings/settings.xml

@@ -3257,7 +3257,12 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
-        <setting id="videoscreen.whitelistdoublerefreshrate" type="boolean" label="14128" help="36445">
+        <setting id="videoscreen.whitelistwholenumber" type="boolean" label="14128" help="36445">
+          <level>3</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="videoscreen.whitelistdoublerefreshrate" type="boolean" label="14129" help="36446">
           <level>3</level>
           <default>true</default>
           <control type="toggle" />

xbmc/windowing/Resolution.cpp

@@ -26,6 +26,7 @@ namespace
 {
 
 const char* SETTING_VIDEOSCREEN_WHITELIST_PULLDOWN{"videoscreen.whitelistpulldown"};
+const char* SETTING_VIDEOSCREEN_WHITELIST_WHOLENUMBER{"videoscreen.whitelistwholenumber"};
 const char* SETTING_VIDEOSCREEN_WHITELIST_DOUBLEREFRESHRATE{
     "videoscreen.whitelistdoublerefreshrate"};
 
@@ -133,41 +134,10 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
     }
   }
 
-  CLog::Log(LOGDEBUG, "[WHITELIST] Searching for an exact resolution with an exact refresh rate");
-
   unsigned int penalty = std::numeric_limits<unsigned int>::max();
   bool found = false;
 
-  for (const auto& mode : indexList)
-  {
-    auto i = CDisplaySettings::GetInstance().GetResFromString(mode.asString());
-    const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i);
-
-    // allow resolutions that are exact and have the correct refresh rate
-    // allow hardware decoder surface padding due to codec block alignment and GPU requirements
-    // note: height has greater tolerance due to 32/64px boundaries e.g. 1080→1088 or 2160→2176
-    if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) ||
-         (width == info.iScreenWidth && height <= info.iScreenHeight + 32)) &&
-        (info.dwFlags & dwFlags) == dwFlags &&
-        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.01f))
-    {
-      CLog::Log(LOGDEBUG,
-                "[WHITELIST] Matched an exact resolution with an exact refresh rate {}, 0x{:x} ({})",
-                info.strMode, info.dwFlags, i);
-      unsigned int pen = abs(info.iScreenHeight - height) + abs(info.iScreenWidth - width);
-      if (pen < penalty)
-      {
-        resolution = i;
-        found = true;
-        penalty = pen;
-      }
-    }
-  }
-
-  if (!found)
-    CLog::Log(LOGDEBUG, "[WHITELIST] No match for an exact resolution with an exact refresh rate");
-
-  if (noWhiteList || CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
           SETTING_VIDEOSCREEN_WHITELIST_DOUBLEREFRESHRATE))
   {
     CLog::Log(LOGDEBUG,
@@ -204,10 +174,79 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
     CLog::Log(LOGDEBUG,
               "[WHITELIST] No match for an exact resolution with double the refresh rate");
   }
-  else if (found)
+
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+          SETTING_VIDEOSCREEN_WHITELIST_WHOLENUMBER))
+  {
+    CLog::Log(LOGDEBUG,
+              "[WHITELIST] Searching for an exact resolution with a whole-number repeat refresh rate");
+
+    for (const auto& mode : indexList)
+    {
+      auto i = CDisplaySettings::GetInstance().GetResFromString(mode.asString());
+      const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i);
+
+      // allow resolutions that are exact and have 5 times the refresh rate
+      // allow hardware decoder surface padding due to codec block alignment and GPU requirements
+      if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) ||
+           (width == info.iScreenWidth && height <= info.iScreenHeight + 32)) &&
+          (info.dwFlags & dwFlags) == dwFlags &&
+          (MathUtils::FloatEquals(info.fRefreshRate, fps * 4.0f, 0.01f) ||
+           MathUtils::FloatEquals(info.fRefreshRate, fps * 5.0f, 0.01f)))
+      {
+        CLog::Log(
+            LOGDEBUG,
+            "[WHITELIST] Matched an exact resolution with a whole-number repeat refresh rate {} ({})",
+            info.strMode, i);
+        unsigned int pen = abs(info.iScreenHeight - height) + abs(info.iScreenWidth - width);
+        if (pen < penalty)
+        {
+          resolution = i;
+          found = true;
+          penalty = pen;
+        }
+      }
+    }
+    if (found)
+      return;
+
+    CLog::Log(LOGDEBUG, "[WHITELIST] No match for a resolution with a whole-number repeat refresh rate");
+  }
+
+  CLog::Log(LOGDEBUG, "[WHITELIST] Searching for an exact resolution with an exact refresh rate");
+
+  for (const auto& mode : indexList)
+  {
+    auto i = CDisplaySettings::GetInstance().GetResFromString(mode.asString());
+    const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i);
+
+    // allow resolutions that are exact and have the correct refresh rate
+    // allow hardware decoder surface padding due to codec block alignment and GPU requirements
+    // note: height has greater tolerance due to 32/64px boundaries e.g. 1080→1088 or 2160→2176
+    if (((height == info.iScreenHeight && width <= info.iScreenWidth + 8) ||
+         (width == info.iScreenWidth && height <= info.iScreenHeight + 32)) &&
+        (info.dwFlags & dwFlags) == dwFlags &&
+        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.01f))
+    {
+      CLog::Log(LOGDEBUG,
+                "[WHITELIST] Matched an exact resolution with an exact refresh rate {}, 0x{:x} ({})",
+                info.strMode, info.dwFlags, i);
+      unsigned int pen = abs(info.iScreenHeight - height) + abs(info.iScreenWidth - width);
+      if (pen < penalty)
+      {
+        resolution = i;
+        found = true;
+        penalty = pen;
+      }
+    }
+  }
+
+  if (!found)
+    CLog::Log(LOGDEBUG, "[WHITELIST] No match for an exact resolution with an exact refresh rate");
+  else
     return;
 
-  if (noWhiteList || CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
           SETTING_VIDEOSCREEN_WHITELIST_PULLDOWN))
   {
     CLog::Log(LOGDEBUG,
@@ -270,8 +309,10 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
   }
   if (!found)
     CLog::Log(LOGDEBUG, "[WHITELIST] No match for a closest resolution with an exact refresh rate");
+  else
+    return;
 
-  if (noWhiteList || CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
           SETTING_VIDEOSCREEN_WHITELIST_DOUBLEREFRESHRATE))
   {
     CLog::Log(LOGDEBUG, "[WHITELIST] Searching for a closest resolution with double refresh rate");
@@ -302,8 +343,6 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
 
     CLog::Log(LOGDEBUG, "[WHITELIST] No match for a closest resolution with double refresh rate");
   }
-  else if (found)
-    return;
 
   CLog::Log(LOGDEBUG, "[WHITELIST] Searching for a desktop resolution with an exact refresh rate");
 
@@ -327,7 +366,7 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
 
   CLog::Log(LOGDEBUG, "[WHITELIST] No match for a desktop resolution with an exact refresh rate");
 
-  if (noWhiteList || CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
           SETTING_VIDEOSCREEN_WHITELIST_DOUBLEREFRESHRATE))
   {
     CLog::Log(LOGDEBUG,
@@ -355,7 +394,7 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
               "[WHITELIST] No match for a desktop resolution with double the refresh rate");
   }
 
-  if (noWhiteList || CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
           SETTING_VIDEOSCREEN_WHITELIST_PULLDOWN))
   {
     CLog::Log(LOGDEBUG,
@@ -384,6 +423,36 @@ void CResolutionUtils::FindResolutionFromWhitelist(float fps, int width, int hei
               "[WHITELIST] No match for a desktop resolution with a 3:2 pulldown refresh rate");
   }
 
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+          SETTING_VIDEOSCREEN_WHITELIST_WHOLENUMBER))
+  {
+    CLog::Log(LOGDEBUG,
+              "[WHITELIST] Searching for a desktop resolution with a whole-number repeat refresh rate");
+
+    for (const auto& mode : indexList)
+    {
+      auto i = CDisplaySettings::GetInstance().GetResFromString(mode.asString());
+      const RESOLUTION_INFO info = CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(i);
+
+      // allow resolutions that are desktop resolution but have whole-number refresh rate
+      if (info.iScreenWidth == desktop_info.iScreenWidth &&
+          (info.dwFlags & dwFlags) == dwFlags &&
+          (MathUtils::FloatEquals(info.fRefreshRate, fps * 4.0f, 0.01f) ||
+           MathUtils::FloatEquals(info.fRefreshRate, fps * 5.0f, 0.01f)))
+      {
+        CLog::Log(
+            LOGDEBUG,
+            "[WHITELIST] Matched a desktop resolution with a whole-number repeat refresh rate {} ({})",
+            info.strMode, i);
+        resolution = i;
+        return;
+      }
+    }
+
+    CLog::Log(LOGDEBUG,
+              "[WHITELIST] No match for a desktop resolution with a whole-number repeat refresh rate");
+  }
+
   if (is3D && curr.fRefreshRate > 30)
   {
     CLog::Log(LOGDEBUG, "[WHITELIST] No resolution matched but refresh rate is {:0.3f}", curr.fRefreshRate);