Packman Build Service PMBS

_service:download_files:master.tar.gz/.gitignore Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes_PVR.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MyPVRGuide.xml Changed

@@ -114,7 +114,7 @@
 							<param name="control_id" value="50"/>
 							<param name="control_orientation" value="vertical"/>
 							<param name="control_top" value="55"/>
-							<param name="control_onup_id" value="11"/>
+							<param name="control_onupdown_id" value="11"/>
 							<param name="viewtype_label" value="19298"/>
 							<param name="progress_texture_border" value="0,60,18,14"/>
 							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
@@ -128,7 +128,7 @@
 							<param name="control_id" value="51"/>
 							<param name="control_orientation" value="horizontal"/>
 							<param name="control_top" value="55"/>
-							<param name="control_onup_id" value="11"/>
+							<param name="control_onupdown_id" value="11"/>
 							<param name="viewtype_label" value="19297"/>
 							<param name="progress_texture_border" value="5,10,5,10"/>
 							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
@@ -142,7 +142,7 @@
 							<param name="control_id" value="52"/>
 							<param name="control_orientation" value="vertical"/>
 							<param name="control_top" value="0"/>
-							<param name="control_onup_id" value="52"/>
+							<param name="control_onupdown_id" value="52"/>
 							<param name="viewtype_label" value="19301"/>
 							<param name="progress_texture_border" value="0,60,18,14"/>
 							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
@@ -156,7 +156,7 @@
 							<param name="control_id" value="53"/>
 							<param name="control_orientation" value="horizontal"/>
 							<param name="control_top" value="0"/>
-							<param name="control_onup_id" value="53"/>
+							<param name="control_onupdown_id" value="53"/>
 							<param name="viewtype_label" value="19300"/>
 							<param name="progress_texture_border" value="5,10,5,10"/>
 							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>

_service:download_files:master.tar.gz/cmake/scripts/common/Macros.cmake Changed

@@ -634,6 +634,7 @@
   else()
     find_package(Git)
     if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+      # get tree status i.e. clean working tree vs dirty (uncommited or unstashed changes, etc.)
       execute_process(COMMAND ${GIT_EXECUTABLE} update-index --ignore-submodules -q --refresh
                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
       execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet --
@@ -644,21 +645,21 @@
                         RESULT_VARIABLE status_code
                         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
         endif()
+        # get HEAD commit SHA-1
+        execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
+                        OUTPUT_VARIABLE HASH
+                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        string(REPLACE "\"" "" HASH ${HASH})
+
         if(status_code)
-          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h-dirty" HEAD
-                          OUTPUT_VARIABLE HASH
-                          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-          string(SUBSTRING ${HASH} 1 13 HASH)
-        else()
-          execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" HEAD
-                          OUTPUT_VARIABLE HASH
-                          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-          string(SUBSTRING ${HASH} 1 7 HASH)
+          string(CONCAT HASH ${HASH} "-dirty")
         endif()
+
+      # get HEAD commit date
       execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD
                       OUTPUT_VARIABLE DATE
                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-      string(SUBSTRING ${DATE} 1 10 DATE)
+      string(REPLACE "\"" "" DATE ${DATE})
       string(REPLACE "-" "" DATE ${DATE})
     else()
       string(TIMESTAMP DATE "%Y%m%d" UTC)

_service:download_files:master.tar.gz/cmake/scripts/windows/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/windowsstore/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/system/shaders/GL/1.2/gl_yuv2rgb_basic.glsl Changed

_service:download_files:master.tar.gz/system/shaders/GL/1.5/gl_yuv2rgb_basic.glsl Changed

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_d3d.fx Changed

_service:download_files:master.tar.gz/tools/buildsteps/windows/vswhere.bat Changed

_service:download_files:master.tar.gz/tools/depends/.gitignore Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp Changed

@@ -54,8 +54,7 @@
 
 // amcodec include
 extern "C" {
-#include <codec.h>
-#include <amports/amstream.h>
+#include <amcodec/codec.h>
 }  // extern "C"
 
 CEvent g_aml_sync_event;
@@ -345,44 +344,6 @@
   int buf_avail_num;
 } vframe_states_t;
 
-static int aml_ioctl_get(CODEC_HANDLE h, int subcmd, unsigned long paramter)
-{
-  struct am_ioctl_parm parm;
-  memset(&parm, 0, sizeof(parm));
-  parm.cmd = subcmd;
-  parm.data_32 = *(unsigned int *)paramter;
-  if (ioctl(h, AMSTREAM_IOC_GET, (unsigned long)&parm) < 0)
-  {
-    CLog::Log(LOGERROR, "aml_ioctl_get failed: subcmd=%x, errno=%d", subcmd, errno);
-    return -1;
-  }
-  *(unsigned int *)paramter = parm.data_32;
-  return 0;
-}
-
-
-#ifndef AMSTREAM_IOC_MAGIC
-#define AMSTREAM_IOC_MAGIC  'S'
-#endif
-
-#ifndef AMSTREAM_IOC_VF_STATUS
-#define AMSTREAM_IOC_VF_STATUS  _IOR(AMSTREAM_IOC_MAGIC, 0x60, unsigned long)
-#endif
-
-#ifndef AMSTREAM_IOC_GET_3D_TYPE
-#define AMSTREAM_IOC_GET_3D_TYPE _IOW((AMSTREAM_IOC_MAGIC), 0x3d, unsigned int)
-#endif
-
-
-enum
-{
-  VPP_3D_MODE_NULL = 0,
-  VPP_3D_MODE_LR,
-  VPP_3D_MODE_TB,
-  VPP_3D_MODE_LA,
-  VPP_3D_MODE_FA
-};
-
 /*************************************************************************/
 /*************************************************************************/
 void dumpfile_open(am_private_t *para)
@@ -2267,65 +2228,6 @@
   SysfsUtils::SetInt("/sys/class/video/saturation", saturation);
 }
 
-bool CAMLCodec::SetVideo3dMode(const int mode3d)
-{
-  bool result = true;
-  if (SysfsUtils::Has("/sys/class/ppmgr/ppmgr_3d_mode"))
-  {
-    CLog::Log(LOGDEBUG, "CAMLCodec::SetVideo3dMode:mode3d(0x%x)", mode3d);
-    SysfsUtils::SetInt("/sys/class/ppmgr/ppmgr_3d_mode", mode3d);
-  }
-  else
-  {
-    CLog::Log(LOGINFO, "CAMLCodec::SetVideo3dMode: ppmgr_3d support not found in kernel.");
-    result = false;
-  }
-  return result;
-}
-
-std::string CAMLCodec::GetStereoMode()
-{
-  std::string stereoMode;
-
-  //Get Decoder Stereo mode
-  int decoder_sm(VPP_3D_MODE_NULL);
-  aml_ioctl_get(am_private->vcodec.handle, AMSTREAM_IOC_GET_3D_TYPE, (unsigned long)&decoder_sm);
-
-  switch (decoder_sm)
-  {
-  case VPP_3D_MODE_LR:
-    stereoMode = "left_right";
-    break;
-  case VPP_3D_MODE_TB:
-    stereoMode = "top_bottom";
-    break;
-  case VPP_3D_MODE_LA:
-  case VPP_3D_MODE_FA:
-  default:
-    switch(m_processInfo.GetVideoSettings().m_StereoMode)
-    {
-    case RENDER_STEREO_MODE_SPLIT_VERTICAL:
-      stereoMode = "left_right";
-      break;
-    case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
-      stereoMode = "top_bottom";
-      break;
-    default:
-      stereoMode = m_hints.stereo_mode;
-      break;
-    }
-  }
-
-  if (m_processInfo.GetVideoSettings().m_StereoInvert)
-  {
-    if (stereoMode == "top_bottom")
-      stereoMode = "bottom_top";
-    else if (stereoMode == "left_right")
-        stereoMode = "right_left";
-  }
-  return stereoMode;
-}
-
 void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
 {
   // this routine gets called every video frame
@@ -2362,20 +2264,20 @@
     update = true;
   }
 
-  // video stereo mode/view.
-  RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode();
-  if (m_stereo_mode != stereo_mode)
+  // GUI stereo mode/view.
+  RENDER_STEREO_MODE guiStereoMode = g_graphicsContext.GetStereoMode();
+  if (m_guiStereoMode != guiStereoMode)
   {
-    m_stereo_mode = stereo_mode;
+    m_guiStereoMode = guiStereoMode;
     update = true;
   }
-  RENDER_STEREO_VIEW stereo_view = g_graphicsContext.GetStereoView();
-  if (m_stereo_view != stereo_view)
+  RENDER_STEREO_VIEW guiStereoView = g_graphicsContext.GetStereoView();
+  if (m_guiStereoView != guiStereoView)
   {
     // left/right/top/bottom eye,
     // this might change every other frame.
     // we do not care but just track it.
-    m_stereo_view = stereo_view;
+    m_guiStereoView = guiStereoView;
   }
 
   // dest_rect
@@ -2427,9 +2329,9 @@
   {
     float xscale = display.Width() / gui.Width();
     float yscale = display.Height() / gui.Height();
-    if (m_stereo_mode == RENDER_STEREO_MODE_SPLIT_VERTICAL)
+    if (m_guiStereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL)
       xscale /= 2.0;
-    else if (m_stereo_mode == RENDER_STEREO_MODE_SPLIT_HORIZONTAL)
+    else if (m_guiStereoMode == RENDER_STEREO_MODE_SPLIT_HORIZONTAL)
       yscale /= 2.0;
     dst_rect.x1 *= xscale;
     dst_rect.x2 *= xscale;
@@ -2437,75 +2339,21 @@
     dst_rect.y2 *= yscale;
   }
 
-  if (m_stereo_mode == RENDER_STEREO_MODE_MONO)
+  if (m_guiStereoMode == RENDER_STEREO_MODE_MONO)
   {
-    std::string mode = GetStereoMode();
-    if (mode == "left_right")
-    {
-      if (!SetVideo3dMode(MODE_3D_TO_2D_L))
-      {
-        // fall back to software scaling if no hw support
-        // was found
-        dst_rect.x2 *= 2.0;
-      }
-    }
-    else if (mode == "right_left")
-    {
-      if (!SetVideo3dMode(MODE_3D_TO_2D_R))
-      {
-        // fall back to software scaling if no hw support
-        // was found
-        dst_rect.x2 *= 2.0;
-      }
-    }
-    else if (mode == "top_bottom")
-    {
-      if (!SetVideo3dMode(MODE_3D_TO_2D_T))
-      {
-        // fall back to software scaling if no hw support
-        // was found
-        dst_rect.y2 *= 2.0;
-      }
-    }
-    else if (mode == "bottom_top")
-    {
-      if (!SetVideo3dMode(MODE_3D_TO_2D_B))
-      {

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodecSurface.cpp Changed

@@ -119,37 +119,39 @@
 void CRendererMediaCodecSurface::RenderUpdate(int index, int index2, bool clear, unsigned int flags, unsigned int alpha)
 {
   CXBMCApp::get()->WaitVSync(100);
-  ManageRenderArea();
   m_bConfigured = true;
-}
-
-void CRendererMediaCodecSurface::ReorderDrawPoints()
-{
-  CBaseRenderer::ReorderDrawPoints();
 
   // this hack is needed to get the 2D mode of a 3D movie going
   RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode();
   if (stereo_mode)
     g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_LEFT);
 
+  ManageRenderArea();
+
   if (stereo_mode)
     g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_OFF);
 
   m_surfDestRect = m_destRect;
-  CRect srcRect(m_sourceRect);
   switch (stereo_mode)
   {
     case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
       m_surfDestRect.y2 *= 2.0;
-      srcRect.y2 *= 2.0;
       break;
     case RENDER_STEREO_MODE_SPLIT_VERTICAL:
       m_surfDestRect.x2 *= 2.0;
-      srcRect.x2 *= 2.0;
+      break;
+    case RENDER_STEREO_MODE_MONO:
+      m_surfDestRect.y2 = m_surfDestRect.y2 * (m_surfDestRect.y2 / m_sourceRect.y2);
+      m_surfDestRect.x2 = m_surfDestRect.x2 * (m_surfDestRect.x2 / m_sourceRect.x2);
       break;
     default:
       break;
   }
+}
+
+void CRendererMediaCodecSurface::ReorderDrawPoints()
+{
+  CBaseRenderer::ReorderDrawPoints();
 
   // Handle orientation
   switch (m_renderOrientation)

_service:download_files:master.tar.gz/xbmc/platform/win10/Win10App.cpp Changed

@@ -28,6 +28,7 @@
 #include "settings/AdvancedSettings.h"
 #include "platform/Environment.h"
 #include "utils/log.h"
+#include "utils/SystemInfo.h"
 #include "windowing/win10/WinEventsWin10.h"
 #include "Win10App.h"
 
@@ -83,7 +84,6 @@
 // Called when the CoreWindow object is created (or re-created).
 void App::SetWindow(CoreWindow^ window)
 {
-  DX::CoreWindowHolder::Get()->SetWindow(window);
 }
 
 // Initializes scene resources, or loads a previously saved app state.
@@ -105,6 +105,10 @@
 
     CAppParamParser appParamParser;
     appParamParser.Parse(m_argv.data(), m_argv.size());
+
+    if (CSysInfo::GetWindowsDeviceFamily() == CSysInfo::Xbox)
+      g_application.SetStandAlone(true);
+
     // Create and run the app
     XBMC_Run(true, appParamParser);
   }
@@ -136,8 +140,18 @@
   m_argv.clear();
   push_back(m_argv, std::string("dummy"));
 
+  if (args->Kind == ActivationKind::Launch)
+  {
+    auto launchArgs = static_cast<LaunchActivatedEventArgs^>(args);
+    if (launchArgs->PrelaunchActivated)
+    {
+      // opt-out of Prelaunch
+      CoreApplication::Exit();
+      return;
+    }
+  }
   // Check for protocol activation
-  if (args->Kind == ActivationKind::Protocol)
+  else if (args->Kind == ActivationKind::Protocol)
   {
     auto protocolArgs = static_cast< ProtocolActivatedEventArgs^>(args);
     Platform::String^ argval = protocolArgs->Uri->ToString();

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainer.cpp Changed

@@ -1674,6 +1674,62 @@
   SetBlock(offset);
 }
 
+void CGUIEPGGridContainer::GoToTop()
+{
+  if (m_orientation == VERTICAL)
+  {
+    if (m_gridModel->HasChannelItems())
+      GoToChannel(0);
+  }
+  else
+  {
+    if (m_gridModel->HasProgrammeItems())
+      GoToBlock(0);
+  }
+}
+
+void CGUIEPGGridContainer::GoToBottom()
+{
+  if (m_orientation == VERTICAL)
+  {
+    if (m_gridModel->HasChannelItems())
+      GoToChannel(m_gridModel->ChannelItemsSize() - 1);
+  }
+  else
+  {
+    if (m_gridModel->HasProgrammeItems())
+      GoToBlock(m_gridModel->ProgrammeItemsSize() - 1);
+  }
+}
+
+void CGUIEPGGridContainer::GoToMostLeft()
+{
+  if (m_orientation == VERTICAL)
+  {
+    if (m_gridModel->HasProgrammeItems())
+      GoToBlock(m_gridModel->ProgrammeItemsSize() - 1);
+  }
+  else
+  {
+    if (m_gridModel->HasChannelItems())
+      GoToChannel(m_gridModel->ChannelItemsSize() - 1);
+  }
+}
+
+void CGUIEPGGridContainer::GoToMostRight()
+{
+  if (m_orientation == VERTICAL)
+  {
+    if (m_gridModel->HasProgrammeItems())
+      GoToBlock(0);
+  }
+  else
+  {
+    if (m_gridModel->HasChannelItems())
+      GoToChannel(0);
+  }
+}
+
 void CGUIEPGGridContainer::SetTimelineItems(const std::unique_ptr<CFileItemList> &items, const CDateTime &gridStart, const CDateTime &gridEnd)
 {
   int iRulerUnit;

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainer.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.cpp Changed

@@ -236,10 +236,69 @@
   return true;
 }
 
+bool CGUIWindowPVRGuideBase::ShouldNavigateToGridContainer(int iAction)
+{
+  CGUIEPGGridContainer *epgGridContainer = GetGridControl();
+  CGUIControl* control = GetControl(CONTROL_LSTCHANNELGROUPS);
+  if (epgGridContainer && control &&
+      GetFocusedControlID() == control->GetID())
+  {
+    int iNavigationId = control->GetAction(iAction).GetNavigation();
+    if (iNavigationId > 0)
+    {
+      control = epgGridContainer;
+      while (control != this) // navigation target could be the grid control or one of its parent controls.
+      {
+        if (iNavigationId == control->GetID())
+        {
+          // channel group selector control's target for the action is the grid control
+          return true;
+        }
+        control = control->GetParentControl();
+      }
+    }
+  }
+  return false;
+}
+
 bool CGUIWindowPVRGuideBase::OnAction(const CAction &action)
 {
   switch (action.GetID())
   {
+    case ACTION_MOVE_UP:
+    case ACTION_MOVE_DOWN:
+    case ACTION_MOVE_LEFT:
+    case ACTION_MOVE_RIGHT:
+    {
+      // Check whether grid container is configured as channel group selector's navigation target for the given action.
+      if (ShouldNavigateToGridContainer(action.GetID()))
+      {
+        CGUIEPGGridContainer *epgGridContainer = GetGridControl();
+        if (epgGridContainer)
+        {
+          CGUIWindowPVRBase::OnAction(action);
+
+          switch (action.GetID())
+          {
+            case ACTION_MOVE_UP:
+              epgGridContainer->GoToBottom();
+              return true;
+            case ACTION_MOVE_DOWN:
+              epgGridContainer->GoToTop();
+              return true;
+            case ACTION_MOVE_LEFT:
+              epgGridContainer->GoToMostRight();
+              return true;
+            case ACTION_MOVE_RIGHT:
+              epgGridContainer->GoToMostLeft();
+              return true;
+            default:
+              break;
+          }
+        }
+      }
+      break;
+    }
     case REMOTE_0:
       if (GetCurrentDigitCount() == 0)
       {

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/dx/DeviceResources.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/dx/RenderContext.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/AMLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/AMLUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CPUInfo.cpp Changed

@@ -157,7 +157,11 @@
     m_cores[core.m_id] = core;
   }
 #elif defined(TARGET_WINDOWS_STORE)
-  CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
+  SYSTEM_INFO siSysInfo;
+  GetNativeSystemInfo(&siSysInfo);
+  m_cpuCount = siSysInfo.dwNumberOfProcessors;
+  m_cpuModel = "Unknown";
+
 #elif defined(TARGET_WINDOWS_DESKTOP)
   using KODI::PLATFORM::WINDOWS::FromW;
 
@@ -688,18 +692,10 @@
 bool CCPUInfo::readProcStat(unsigned long long& user, unsigned long long& nice,
     unsigned long long& system, unsigned long long& idle, unsigned long long& io)
 {
-#if defined(TARGET_WINDOWS_STORE)
-  // introduced in 10.0.15063.0
-  // auto diagnostic = Windows::System::Diagnostics::SystemDiagnosticInfo::GetForCurrentSystem();
-  // auto usage = diagnostic->CpuUsage;
- 
-  // user = report->UserTime.Duration;
-  // system = report->KernelTime.Duration;
-  // idle = report->IdleTime.Duration;
+#if defined(TARGET_WINDOWS)
   nice = 0;
   io = 0;
-  return false;
-#elif defined (TARGET_WINDOWS_DESKTOP) 
+#if defined (TARGET_WINDOWS_DESKTOP) 
   FILETIME idleTime;
   FILETIME kernelTime;
   FILETIME userTime;
@@ -710,8 +706,6 @@
   // returned "kernelTime" includes "idleTime"
   system = (uint64_t(kernelTime.dwHighDateTime) << 32) + uint64_t(kernelTime.dwLowDateTime) - idle;
   user = (uint64_t(userTime.dwHighDateTime) << 32) + uint64_t(userTime.dwLowDateTime);
-  nice = 0;
-  io = 0;
 
   if (m_cpuFreqCounter && PdhCollectQueryData(m_cpuQueryLoad) == ERROR_SUCCESS)
   {
@@ -744,6 +738,31 @@
   else
     for (std::map<int, CoreInfo>::iterator it = m_cores.begin(); it != m_cores.end(); ++it)
       it->second.m_fPct = double(m_lastUsedPercentage); // use CPU average as fallback
+#endif // TARGET_WINDOWS_DESKTOP
+#if defined(TARGET_WINDOWS_STORE) && defined(NTDDI_WIN10_RS2) && (NTDDI_VERSION >= NTDDI_WIN10_RS2)
+  // introduced in 10.0.15063.0
+  if (Windows::Foundation::Metadata::ApiInformation::IsTypePresent("Windows.System.Diagnostics.SystemDiagnosticInfo"))
+  {
+    try
+    {
+      auto diagnostic = Windows::System::Diagnostics::SystemDiagnosticInfo::GetForCurrentSystem();
+      auto usage = diagnostic->CpuUsage;
+      auto report = usage->GetReport();
+
+      user = report->UserTime.Duration;
+      idle = report->IdleTime.Duration;
+      system = report->KernelTime.Duration - idle;
+      return true;
+    }
+    catch (...)
+    {
+      // requires Win10 CU (10.0.15063) or later
+      return false;
+    }
+  }
+  else
+#endif // TARGET_WINDOWS_STORE
+    return false;
 #elif defined(TARGET_FREEBSD)
   long *cptimes;
   size_t len;
@@ -864,16 +883,22 @@
 std::string CCPUInfo::GetCoresUsageString() const
 {
   std::string strCores;
-  for (std::map<int, CoreInfo>::const_iterator it = m_cores.begin(); it != m_cores.end(); ++it)
+  if (!m_cores.empty())
   {
-    if (!strCores.empty())
-      strCores += ' ';
-    if (it->second.m_fPct < 10.0)
-      strCores += StringUtils::Format("CPU%d: %1.1f%%", it->first, it->second.m_fPct);
-    else
-      strCores += StringUtils::Format("CPU%d: %3.0f%%", it->first, it->second.m_fPct);
+    for (std::map<int, CoreInfo>::const_iterator it = m_cores.begin(); it != m_cores.end(); ++it)
+    {
+      if (!strCores.empty())
+        strCores += ' ';
+      if (it->second.m_fPct < 10.0)
+        strCores += StringUtils::Format("CPU%d: %1.1f%%", it->first, it->second.m_fPct);
+      else
+        strCores += StringUtils::Format("CPU%d: %3.0f%%", it->first, it->second.m_fPct);
+    }
+  }
+  else 
+  {
+    strCores += StringUtils::Format("%3.0f%%", double(m_lastUsedPercentage));
   }
-
   return strCores;
 }

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinEventsWin10.cpp Changed

@@ -29,6 +29,7 @@
 #include "messaging/ApplicationMessenger.h"
 #include "platform/win10/input/RemoteControlXbox.h"
 #include "rendering/dx/DeviceResources.h"
+#include "platform/win10/AsyncHelpers.h"
 #include "rendering/dx/RenderContext.h"
 #include "utils/log.h"
 #include "utils/SystemInfo.h"
@@ -108,6 +109,21 @@
   window->SizeChanged += ref new TypedEventHandler<CoreWindow^, WindowSizeChangedEventArgs^>([&](CoreWindow^ wnd, WindowSizeChangedEventArgs^ args) {
     OnWindowSizeChanged(wnd, args);
   });
+#if defined(NTDDI_WIN10_RS2) && (NTDDI_VERSION >= NTDDI_WIN10_RS2)
+  try
+  {
+    window->ResizeStarted += ref new TypedEventHandler<CoreWindow^, Platform::Object^>([&](CoreWindow^ wnd, Platform::Object^ args) {
+      OnWindowResizeStarted(wnd, args);
+    });
+    window->ResizeCompleted += ref new TypedEventHandler<CoreWindow^, Platform::Object^>([&](CoreWindow^ wnd, Platform::Object^ args) {
+      OnWindowResizeCompleted(wnd, args);
+    });
+  } 
+  catch (Platform::Exception^ ex)
+  {
+    // Win10 Creators Update is required
+  }
+#endif
   window->Closed += ref new TypedEventHandler<CoreWindow^, CoreWindowEventArgs^>([&](CoreWindow^ wnd, CoreWindowEventArgs^ args) {
     OnWindowClosed(wnd, args);
   });
@@ -191,8 +207,51 @@
 // Window event handlers.
 void CWinEventsWin10::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEventArgs^ args)
 {
-  DX::Windowing().OnResize(args->Size.Width, args->Size.Height);
-  UpdateWindowSize();
+  CLog::Log(LOGDEBUG, __FUNCTION__": window size changed.");
+  m_logicalWidth = args->Size.Width;
+  m_logicalHeight = args->Size.Height;
+  m_bResized = true;
+
+  if (m_sizeChanging)
+    return;
+
+  HandleWindowSizeChanged();
+}
+
+void CWinEventsWin10::OnWindowResizeStarted(Windows::UI::Core::CoreWindow^ sender, Platform::Object ^ args)
+{
+  CLog::Log(LOGDEBUG, __FUNCTION__": window resize started.");
+  m_logicalPosX = sender->Bounds.X;
+  m_logicalPosY = sender->Bounds.Y;
+  m_sizeChanging = true;
+}
+
+void CWinEventsWin10::OnWindowResizeCompleted(Windows::UI::Core::CoreWindow^ sender, Platform::Object ^ args)
+{
+  CLog::Log(LOGDEBUG, __FUNCTION__": window resize completed.");
+  m_sizeChanging = false;
+
+  if (m_logicalPosX != sender->Bounds.X || m_logicalPosY != sender->Bounds.Y)
+    m_bMoved = true;
+
+  HandleWindowSizeChanged();
+}
+
+void CWinEventsWin10::HandleWindowSizeChanged()
+{
+  CLog::Log(LOGDEBUG, __FUNCTION__": window size/move handled.");
+  if (m_bMoved)
+  {
+    // it will get position from CoreWindow
+    DX::Windowing().OnMove(0, 0);
+  }
+  if (m_bResized)
+  {
+    DX::Windowing().OnResize(m_logicalWidth, m_logicalHeight);
+    UpdateWindowSize();
+  }
+  m_bResized = false;
+  m_bMoved = false;
 }
 
 void CWinEventsWin10::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args)
@@ -487,7 +546,7 @@
 
 void CWinEventsWin10::OnDisplayContentsInvalidated(DisplayInformation^ sender, Platform::Object^ args)
 {
-  //critical_section::scoped_lock lock(m_deviceResources->GetCriticalSection());
+  CLog::Log(LOGDEBUG, __FUNCTION__": onevent.");
   DX::DeviceResources::Get()->ValidateDevice();
 }

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinEventsWin10.h Changed

@@ -26,6 +26,7 @@
 #include "interfaces/IAnnouncer.h"
 #include "windowing/WinEvents.h"
 #include <concurrent_queue.h>
+#include <cmath>
 
 class CWinEventsWin10 : public IWinEvents
                       , public ANNOUNCEMENT::IAnnouncer
@@ -41,6 +42,8 @@
 
   // Window event handlers.
   void OnWindowSizeChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowSizeChangedEventArgs^ args);
+  void OnWindowResizeStarted(Windows::UI::Core::CoreWindow^ sender, Platform::Object^ args);
+  void OnWindowResizeCompleted(Windows::UI::Core::CoreWindow^ sender, Platform::Object^ args);
   void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args);
   static void OnWindowActivationChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowActivatedEventArgs^ args);
   static void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
@@ -65,10 +68,21 @@
   void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) override;
 
 private:
+  friend class CWinSystemWin10;
+
   void UpdateWindowSize();
   void Kodi_KeyEvent(unsigned int vkey, unsigned scancode, unsigned keycode, bool isDown);
+  void HandleWindowSizeChanged();
+
   Concurrency::concurrent_queue<XBMC_Event> m_events;
   Windows::Media::SystemMediaTransportControls^ m_smtc{ nullptr };
+  bool m_bResized{ false };
+  bool m_bMoved{ false };
+  bool m_sizeChanging{ false };
+  float m_logicalWidth{ 0 };
+  float m_logicalHeight{ 0 };
+  float m_logicalPosX{ 0 };
+  float m_logicalPosY{ 0 };
 };
 
 #endif // WINDOW_EVENTS_WIN10_H

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10.cpp Changed

@@ -25,17 +25,18 @@
 #include "guilib/gui3d.h"
 #include "guilib/GraphicContext.h"
 #include "messaging/ApplicationMessenger.h"
+#include "platform/win10/AsyncHelpers.h"
 #include "platform/win10/input/RemoteControlXbox.h"
 #include "platform/win32/CharsetConverter.h"
 #include "powermanagement/win10/Win10PowerSyscall.h"
 #include "rendering/dx/DirectXHelper.h"
+#include "rendering/dx/RenderContext.h"
 #include "ServiceBroker.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
-#include "utils/CharsetConverter.h"
 #include "utils/SystemInfo.h"
 #include "windowing/windows/VideoSyncD3D.h"
 #include "WinEventsWin10.h"
@@ -43,9 +44,16 @@
 
 #pragma pack(push,8)
 
+#include <collection.h>
 #include <tpcshrd.h>
 #include <ppltasks.h>
 
+using namespace Windows::Graphics::Display;
+#if defined(NTDDI_WIN10_RS2) && (NTDDI_VERSION >= NTDDI_WIN10_RS2)
+using namespace Windows::Graphics::Display::Core;
+#endif
+using namespace Windows::UI::ViewManagement;
+
 CWinSystemWin10::CWinSystemWin10()
   : CWinSystemBase()
   , m_nPrimary(0)
@@ -96,6 +104,7 @@
 
 bool CWinSystemWin10::DestroyWindowSystem()
 {
+  m_bWindowCreated = false;
   RestoreDesktopResolution(m_nScreen);
   return true;
 }
@@ -174,9 +183,12 @@
   m_nWidth = newWidth;
   m_nHeight = newHeight;
 
-  auto appView = Windows::UI::ViewManagement::ApplicationView::GetForCurrentView();
-  appView->PreferredLaunchViewSize = Windows::Foundation::Size(m_nWidth, m_nHeight);
-  appView->PreferredLaunchWindowingMode = Windows::UI::ViewManagement::ApplicationViewWindowingMode::PreferredLaunchViewSize;
+  float dpi = DX::DeviceResources::Get()->GetDpi();
+  int dipsWidth = round(DX::ConvertPixelsToDips(m_nWidth, dpi));
+  int dipsHeight = round(DX::ConvertPixelsToDips(m_nHeight, dpi));
+
+  ApplicationView::PreferredLaunchViewSize = Windows::Foundation::Size(dipsWidth, dipsHeight);
+  ApplicationView::PreferredLaunchWindowingMode = ApplicationViewWindowingMode::PreferredLaunchViewSize;
 }
 
 void CWinSystemWin10::AdjustWindow(bool forceResize)
@@ -191,7 +203,7 @@
     if (!isInFullscreen)
     {
       if (appView->TryEnterFullScreenMode())
-        appView->PreferredLaunchWindowingMode = Windows::UI::ViewManagement::ApplicationViewWindowingMode::FullScreen;
+        ApplicationView::PreferredLaunchWindowingMode = ApplicationViewWindowingMode::FullScreen;
     }
   }
   else // m_state == WINDOW_STATE_WINDOWED
@@ -203,16 +215,21 @@
 
     int viewWidth = appView->VisibleBounds.Width;
     int viewHeight = appView->VisibleBounds.Height;
-    if (viewHeight != m_nHeight || viewWidth != m_nWidth)
+
+    float dpi = DX::DeviceResources::Get()->GetDpi();
+    int dipsWidth = round(DX::ConvertPixelsToDips(m_nWidth, dpi));
+    int dipsHeight = round(DX::ConvertPixelsToDips(m_nHeight, dpi));
+
+    if (viewHeight != dipsHeight || viewWidth != dipsWidth)
     {
-      if (!appView->TryResizeView(Windows::Foundation::Size(m_nWidth, m_nHeight)))
+      if (!appView->TryResizeView(Windows::Foundation::Size(dipsWidth, dipsHeight)))
       {
         CLog::LogF(LOGDEBUG, __FUNCTION__, "resizing ApplicationView failed.");
       }
     }
 
-    appView->PreferredLaunchViewSize = Windows::Foundation::Size(m_nWidth, m_nHeight);
-    appView->PreferredLaunchWindowingMode = Windows::UI::ViewManagement::ApplicationViewWindowingMode::PreferredLaunchViewSize;
+    ApplicationView::PreferredLaunchViewSize = Windows::Foundation::Size(dipsWidth, dipsHeight);
+    ApplicationView::PreferredLaunchWindowingMode = ApplicationViewWindowingMode::PreferredLaunchViewSize;
   }
 }
 
@@ -265,7 +282,7 @@
   }
 
   m_IsAlteringWindow = true;
-  //ReleaseBackBuffer();
+  ReleaseBackBuffer();
 
   if (changeScreen)
   {
@@ -322,7 +339,7 @@
   if (changeScreen)
     CenterCursor();
 
-  //CreateBackBuffer();
+  CreateBackBuffer();
   m_IsAlteringWindow = false;
   return true;
 }
@@ -395,9 +412,61 @@
   if (!details)
     return false;
 
-  CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
+#if defined(NTDDI_WIN10_RS2) && (NTDDI_VERSION >= NTDDI_WIN10_RS2)
+  if (Windows::Foundation::Metadata::ApiInformation::IsTypePresent("Windows.Graphics.Display.Core.HdmiDisplayInformation"))
+  {
+    bool changed = false;
+    auto hdmiInfo = HdmiDisplayInformation::GetForCurrentView();
+    if (hdmiInfo != nullptr)
+    {
+      // default mode not in list of supported display modes
+      if (res.iScreenWidth == details->ScreenWidth && res.iScreenHeight == details->ScreenHeight
+        && fabs(res.fRefreshRate - details->RefreshRate) <= 0.00001)
+      {
+        Wait(hdmiInfo->SetDefaultDisplayModeAsync());
+        changed = true;
+      }
+      else
+      {
+        bool needStereo = g_graphicsContext.GetStereoMode() == RENDER_STEREO_MODE_HARDWAREBASED;
+        auto hdmiModes = hdmiInfo->GetSupportedDisplayModes();
+
+        HdmiDisplayMode^ selected = nullptr;
+        for (auto mode : Windows::Foundation::Collections::to_vector(hdmiModes))
+        {
+          if (res.iScreenWidth == mode->ResolutionWidthInRawPixels && res.iScreenHeight == mode->ResolutionHeightInRawPixels
+            && fabs(res.fRefreshRate - mode->RefreshRate) <= 0.00001)
+          {
+            selected = mode;
+            if (needStereo == mode->StereoEnabled)
+              break;
+          }
+        }
+
+        if (selected != nullptr)
+        {
+          changed = Wait(hdmiInfo->RequestSetCurrentDisplayModeAsync(selected));
+        }
+      }
+    }
 
-  return true;
+    // changing display mode doesn't cause OnResize event
+    // for CoreWindow, so we "emulate" it manually
+    if (changed && m_bWindowCreated)
+    {
+      float dpi = DisplayInformation::GetForCurrentView()->LogicalDpi;
+      float dipsW = DX::ConvertPixelsToDips(m_nWidth, dpi);
+      float dipsH = DX::ConvertPixelsToDips(m_nHeight, dpi);
+
+      DX::Windowing().OnResize(dipsW, dipsH);
+      dynamic_cast<CWinEventsWin10*>(m_winEvents.get())->UpdateWindowSize();
+    }
+    return changed;
+  }
+#endif
+
+  CLog::LogFunction(LOGDEBUG, __FUNCTION__, "Not supported.");
+  return false;
 }
 
 void CWinSystemWin10::UpdateResolutions()
@@ -428,6 +497,24 @@
   UpdateDesktopResolution(CDisplaySettings::GetInstance().GetResolutionInfo(RES_DESKTOP), 0, w, h, refreshRate, dwFlags);
   CLog::Log(LOGNOTICE, "Primary mode: %s", CDisplaySettings::GetInstance().GetResolutionInfo(RES_DESKTOP).strMode.c_str());
 
+#if defined(NTDDI_WIN10_RS2) && (NTDDI_VERSION >= NTDDI_WIN10_RS2)
+  if (Windows::Foundation::Metadata::ApiInformation::IsTypePresent("Windows.Graphics.Display.Core.HdmiDisplayInformation"))
+  {
+    auto hdmiInfo = HdmiDisplayInformation::GetForCurrentView();
+    if (hdmiInfo != nullptr)
+    {
+      auto hdmiModes = hdmiInfo->GetSupportedDisplayModes();
+      for (auto mode : Windows::Foundation::Collections::to_vector(hdmiModes))
+      {
+        RESOLUTION_INFO res;
+        UpdateDesktopResolution(res, 0, mode->ResolutionWidthInRawPixels, mode->ResolutionHeightInRawPixels, mode->RefreshRate, 0);
+        AddResolution(res);
+        CLog::Log(LOGNOTICE, "Additional mode: %s %s", res.strMode.c_str(), mode->Is2086MetadataSupported ? "(HDR)" : "");
+      }
+    }
+  }
+#endif
+

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10DX.cpp Changed

Changes of Revision 57