Resolution: use iScreenWidth, iScreenHeight in GetMaxAllowedResolution

GetMaxAllowedResolution is used by inputstream.adaptive addon to
decide on stream resolution in Representation Chooser. As it decides
on video resolution, Kodi should return maximal possible video resolution,
not UI resolution.

1 files changed, 8 insertions, 8 deletions

diff --git a/xbmc/windowing/Resolution.cpp b/xbmc/windowing/Resolution.cpp
index 79123bcda6..682bcc317a 100644
--- a/xbmc/windowing/Resolution.cpp
+++ b/xbmc/windowing/Resolution.cpp
@@ -444,11 +444,11 @@ void CResolutionUtils::GetMaxAllowedResolution(unsigned int& width, unsigned int
     {
       RESOLUTION res = CDisplaySettings::GetInstance().GetResFromString(mode.asString());
       RESOLUTION_INFO resInfo{CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(res)};
-      if (static_cast<unsigned int>(resInfo.iWidth) > maxWidth &&
-          static_cast<unsigned int>(resInfo.iHeight) > maxHeight)
+      if (static_cast<unsigned int>(resInfo.iScreenWidth) > maxWidth &&
+          static_cast<unsigned int>(resInfo.iScreenHeight) > maxHeight)
       {
-        maxWidth = static_cast<unsigned int>(resInfo.iWidth);
-        maxHeight = static_cast<unsigned int>(resInfo.iHeight);
+        maxWidth = static_cast<unsigned int>(resInfo.iScreenWidth);
+        maxHeight = static_cast<unsigned int>(resInfo.iScreenHeight);
       }
     }
   }
@@ -460,11 +460,11 @@ void CResolutionUtils::GetMaxAllowedResolution(unsigned int& width, unsigned int
     for (const auto& res : resList)
     {
       RESOLUTION_INFO resInfo{CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(res)};
-      if (static_cast<unsigned int>(resInfo.iWidth) > maxWidth &&
-          static_cast<unsigned int>(resInfo.iHeight) > maxHeight)
+      if (static_cast<unsigned int>(resInfo.iScreenWidth) > maxWidth &&
+          static_cast<unsigned int>(resInfo.iScreenHeight) > maxHeight)
       {
-        maxWidth = static_cast<unsigned int>(resInfo.iWidth);
-        maxHeight = static_cast<unsigned int>(resInfo.iHeight);
+        maxWidth = static_cast<unsigned int>(resInfo.iScreenWidth);
+        maxHeight = static_cast<unsigned int>(resInfo.iScreenHeight);
       }
     }
   }