Packman Build Service PMBS

_service:download_files:master.tar.gz/addons/resource.language.en_gb/resources/strings.po Changed

_service:download_files:master.tar.gz/cmake/addons/depends/common/kodi-platform/kodi-platform.txt Changed

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/CMakeLists.txt Deleted

@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-project(mingw)
-
-function(generate_mingw32_wrapper cmd)
-  set(CMD ${cmd})
-  configure_file(${PROJECT_SOURCE_DIR}/mingw32-cmd.bat.in ${MINGW_PATH}/bin/${CMD}.bat @ONLY)
-endfunction()
-
-get_filename_component(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../../../../.. REALPATH)
-
-set(MSYS_PATH "${CORE_SOURCE_DIR}/project/BuildDependencies/msys64")
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(MINGW_PATH "${MSYS_PATH}/mingw32")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(MINGW_PATH "${MSYS_PATH}/mingw64")
-endif()
-
-# configure the MinGW toolchain file
-configure_file(${PROJECT_SOURCE_DIR}/Toolchain_mingw32.cmake.in ${CMAKE_INSTALL_PREFIX}/Toolchain_mingw32.cmake @ONLY)
-
-# configure MinGWConfig.cmake
-configure_file(${PROJECT_SOURCE_DIR}/MinGWConfig.cmake.in ${CMAKE_INSTALL_PREFIX}/MinGWConfig.cmake)
-
-# TODO: MinGW GCC 5.3.0-1 comes without cc.exe, Remove this once package is bumped to 5.3.0-p2
-# See https://github.com/Alexpux/MINGW-packages/pull/1034
-if(NOT EXISTS ${MINGW_PATH}/bin/cc.exe)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_PATH}/bin/gcc.exe ${MINGW_PATH}/bin/cc.exe)
-endif()
-
-# configure the MinGW wrapper batch scripts
-generate_mingw32_wrapper("make")
-generate_mingw32_wrapper("gcc")
-generate_mingw32_wrapper("cc")
-generate_mingw32_wrapper("g++")
-generate_mingw32_wrapper("ar")
-generate_mingw32_wrapper("ld")
-generate_mingw32_wrapper("windres")

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/MinGWConfig.cmake.in Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/Toolchain_mingw32.cmake.in Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/mingw.txt Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/mingw32-cmd.bat.in Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/mingw/noinstall.txt Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/msys Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/msys/CMakeLists.txt Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/msys/msys.txt Deleted

_service:download_files:master.tar.gz/cmake/addons/depends/windows/cmake/msys/noinstall.txt Deleted

_service:download_files:master.tar.gz/cmake/platform/linux/gbm.cmake Changed

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

_service:download_files:master.tar.gz/system/settings/gbm.xml Added

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

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

@@ -107,17 +107,19 @@
     return;
   }
 
+  uint8_t* srcPlanes[YuvImage::MAX_PLANES], *dstPlanes[YuvImage::MAX_PLANES];
+  int srcStrides[YuvImage::MAX_PLANES];
+  pSource->videoBuffer->GetPlanes(srcPlanes);
+  pSource->videoBuffer->GetStrides(srcStrides);
+
   videoBuffer = m_processInfo.GetVideoBufferManager().Get(AV_PIX_FMT_YUV420P,
-                                                          pPicture->iWidth * pPicture->iHeight * 3/2, nullptr);
+                                                          srcStrides[0] * pPicture->iHeight +
+                                                          srcStrides[1] * pPicture->iHeight, nullptr);
   if (!videoBuffer)
   {
     return;
   }
 
-  uint8_t* srcPlanes[YuvImage::MAX_PLANES], *dstPlanes[YuvImage::MAX_PLANES];
-  int srcStrides[YuvImage::MAX_PLANES];
-  pSource->videoBuffer->GetPlanes(srcPlanes);
-  pSource->videoBuffer->GetStrides(srcStrides);
   videoBuffer->SetDimensions(pPicture->iWidth, pPicture->iHeight, srcStrides);
   videoBuffer->GetPlanes(dstPlanes);
   pp_postprocess((const uint8_t **)srcPlanes, srcStrides,

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

@@ -1832,8 +1832,18 @@
 {
   ProcessSyncPicture();
   ReleaseBufferPool();
-  delete m_pp;
-  m_pp = NULL;
+  if (m_pp)
+  {
+    std::shared_ptr<CPostproc> pp(m_pp);
+    m_discardedPostprocs.push_back(pp);
+    m_pp->Discard(this, &COutput::ReadyForDisposal);
+    m_pp = nullptr;
+  }
+
+  if (!m_discardedPostprocs.empty())
+  {
+    CLog::Log(LOGERROR, "VAAPI::COutput::Uninit - not all CPostprcs released");
+  }
   return true;
 }
 
@@ -1939,9 +1949,10 @@
 
     if (m_pp && !m_pp->UpdateDeintMethod(method))
     {
-      delete m_pp;
-      m_pp = NULL;
-      DropVppProcessedPictures();
+      std::shared_ptr<CPostproc> pp(m_pp);
+      m_discardedPostprocs.push_back(pp);
+      m_pp->Discard(this, &COutput::ReadyForDisposal);
+      m_pp = nullptr;
       m_config.processInfo->SetVideoDeintMethod("unknown");
     }
     if (!m_pp)
@@ -1985,9 +1996,10 @@
     method = VS_INTERLACEMETHOD_NONE;
     if (m_pp && !m_pp->UpdateDeintMethod(method))
     {
-      delete m_pp;
-      m_pp = NULL;
-      DropVppProcessedPictures();
+      std::shared_ptr<CPostproc> pp(m_pp);
+      m_discardedPostprocs.push_back(pp);
+      m_pp->Discard(this, &COutput::ReadyForDisposal);
+      m_pp = nullptr;
     }
     if (!m_pp)
     {
@@ -2025,8 +2037,14 @@
   retPic = m_bufferPool->GetVaapi();
   retPic->DVDPic.SetParams(pic.DVDPic);
 
-  if (pic.source == CVaapiProcessedPicture::SKIP_SRC ||
-      pic.source == CVaapiProcessedPicture::VPP_SRC)
+  if (!pic.source)
+  {
+    CLog::Log(LOGERROR, "VAAPI::ProcessPicture - pic has no source");
+    retPic->Release();
+    return nullptr;
+  }
+
+  if (pic.source->UseVideoSurface())
   {
     vaSyncSurface(m_config.dpy, pic.videoSurface);
     pic.id = m_bufferPool->procPicId++;
@@ -2034,17 +2052,12 @@
     retPic->procPic = pic;
     retPic->vadsp = m_config.dpy;
   }
-  else if (pic.source == CVaapiProcessedPicture::FFMPEG_SRC)
+  else
   {
     av_frame_move_ref(retPic->avFrame, pic.frame);
-    av_frame_free(&pic.frame);
+    pic.source->ClearRef(pic);
     retPic->procPic.videoSurface = VA_INVALID_ID;
   }
-  else
-  {
-    retPic->Release();
-    return nullptr;
-  }
 
   retPic->DVDPic.dts = DVD_NOPTS_VALUE;
   retPic->DVDPic.iWidth = m_config.vidWidth;
@@ -2057,50 +2070,12 @@
 
 void COutput::ReleaseProcessedPicture(CVaapiProcessedPicture &pic)
 {
-  if (pic.source == CVaapiProcessedPicture::VPP_SRC && m_pp)
+  if (!pic.source)
   {
-    CVppPostproc *pp = dynamic_cast<CVppPostproc*>(m_pp);
-    if (pp)
-    {
-      pp->ClearRef(pic.videoSurface);
-    }
-  }
-  else if (pic.source == CVaapiProcessedPicture::SKIP_SRC)
-  {
-    m_config.videoSurfaces->ClearRender(pic.videoSurface);
-  }
-  else if (pic.source == CVaapiProcessedPicture::FFMPEG_SRC)
-  {
-    av_frame_free(&pic.frame);
-  }
-}
-
-void COutput::DropVppProcessedPictures()
-{
-  auto it = m_bufferPool->processedPics.begin();
-  while (it != m_bufferPool->processedPics.end())
-  {
-    if (it->source == CVaapiProcessedPicture::VPP_SRC)
-    {
-      it = m_bufferPool->processedPics.erase(it);
-      m_config.stats->DecProcessed();
-    }
-    else
-      ++it;
-  }
-
-  it = m_bufferPool->processedPicsAway.begin();
-  while (it != m_bufferPool->processedPicsAway.end())
-  {
-    if (it->source == CVaapiProcessedPicture::VPP_SRC)
-    {
-      it = m_bufferPool->processedPicsAway.erase(it);
-    }
-    else
-      ++it;
+    return;
   }
-
-  m_controlPort.SendInMessage(COutputControlProtocol::STATS);
+  pic.source->ClearRef(pic);
+  pic.source = nullptr;
 }
 
 void COutput::QueueReturnPicture(CVaapiRenderPicture *pic)
@@ -2167,6 +2142,18 @@
   m_bufferPool->processedPics.clear();
 }
 
+void COutput::ReadyForDisposal(CPostproc *pp)
+{
+  for (auto it = m_discardedPostprocs.begin(); it != m_discardedPostprocs.end(); ++it)
+  {
+    if ((*it).get() == pp)
+    {
+      m_discardedPostprocs.erase(it);
+      break;
+    }
+  }
+}
+
 bool COutput::CheckSuccess(VAStatus status)
 {
   if (status != VA_STATUS_SUCCESS)
@@ -2202,11 +2189,12 @@
 
 bool CSkipPostproc::Filter(CVaapiProcessedPicture &outPic)
 {
-  if (m_step>0)
+  if (m_step > 0)
     return false;
   outPic.DVDPic.SetParams(m_pic.DVDPic);
   outPic.videoSurface = m_pic.videoSurface;
-  outPic.source = CVaapiProcessedPicture::SKIP_SRC;
+  m_refsToSurfaces++;
+  outPic.source = this;
   outPic.DVDPic.iFlags &= ~(DVP_FLAG_TOP_FIELD_FIRST |
                             DVP_FLAG_REPEAT_TOP_FIELD |
                             DVP_FLAG_INTERLACED);
@@ -2214,9 +2202,13 @@
   return true;
 }
 
-void CSkipPostproc::ClearRef(VASurfaceID surf)
+void CSkipPostproc::ClearRef(CVaapiProcessedPicture &pic)
 {
+  m_config.videoSurfaces->ClearRender(pic.videoSurface);
+  m_refsToSurfaces--;
 
+  if (m_pOut && m_refsToSurfaces <= 0)
+    (m_pOut->*m_cbDispose)(this);
 }
 
 void CSkipPostproc::Flush()
@@ -2237,6 +2229,19 @@
   return false;
 }
 
+bool CSkipPostproc::UseVideoSurface()
+{
+  return true;
+}
+
+void CSkipPostproc::Discard(COutput *output, ReadyToDispose cb)

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

@@ -146,6 +146,7 @@
 /**
  * Frame after having been processed by vpp
  */
+class CPostproc;
 struct CVaapiProcessedPicture
 {
   CVaapiProcessedPicture() = default;
@@ -168,12 +169,7 @@
   VASurfaceID videoSurface;
   AVFrame *frame;
   int id;
-  enum
-  {
-    VPP_SRC,
-    FFMPEG_SRC,
-    SKIP_SRC
-  }source;
+  CPostproc *source = nullptr;
   bool crop;
 };
 
@@ -270,13 +266,13 @@
   void ProcessReturnProcPicture(int id);
   void ProcessSyncPicture();
   void ReleaseProcessedPicture(CVaapiProcessedPicture &pic);
-  void DropVppProcessedPictures();
   bool Init();
   bool Uninit();
   void Flush();
   void EnsureBufferPool();
   void ReleaseBufferPool(bool precleanup = false);
   bool CheckSuccess(VAStatus status);
+  void ReadyForDisposal(CPostproc *pp);
   CEvent m_outMsgEvent;
   CEvent *m_inMsgEvent;
   int m_state;
@@ -290,6 +286,7 @@
   std::shared_ptr<CVaapiBufferPool> m_bufferPool;
   CVaapiDecodedPicture m_currentPicture;
   CPostproc *m_pp;
+  std::list<std::shared_ptr<CPostproc>> m_discardedPostprocs;
   SDiMethods m_diMethods;
 };
 
@@ -446,6 +443,7 @@
 /**
  *  Base class
  */
+typedef void (COutput::*ReadyToDispose)(CPostproc *pool);
 class CPostproc
 {
 public:
@@ -454,11 +452,13 @@
   virtual bool Init(EINTERLACEMETHOD method) = 0;
   virtual bool AddPicture(CVaapiDecodedPicture &inPic) = 0;
   virtual bool Filter(CVaapiProcessedPicture &outPic) = 0;
-  virtual void ClearRef(VASurfaceID surf) = 0;
+  virtual void ClearRef(CVaapiProcessedPicture &pic) = 0;
   virtual void Flush() = 0;
   virtual bool UpdateDeintMethod(EINTERLACEMETHOD method) = 0;
   virtual bool DoesSync() = 0;
   virtual bool WantsPic() {return true;}
+  virtual bool UseVideoSurface() = 0;
+  virtual void Discard(COutput *output, ReadyToDispose cb) { (output->*cb)(this); };
 protected:
   CVaapiConfig m_config;
   int m_step;
@@ -474,12 +474,17 @@
   bool Init(EINTERLACEMETHOD method) override;
   bool AddPicture(CVaapiDecodedPicture &inPic) override;
   bool Filter(CVaapiProcessedPicture &outPic) override;
-  void ClearRef(VASurfaceID surf) override;
+  void ClearRef(CVaapiProcessedPicture &pic) override;
   void Flush() override;
   bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
   bool DoesSync() override;
+  bool UseVideoSurface() override;
+  void Discard(COutput *output, ReadyToDispose cb) override;
 protected:
   CVaapiDecodedPicture m_pic;
+  ReadyToDispose m_cbDispose;
+  COutput *m_pOut;
+  int m_refsToSurfaces = 0;
 };
 
 /**
@@ -494,11 +499,13 @@
   bool Init(EINTERLACEMETHOD method) override;
   bool AddPicture(CVaapiDecodedPicture &inPic) override;
   bool Filter(CVaapiProcessedPicture &outPic) override;
-  void ClearRef(VASurfaceID surf) override;
+  void ClearRef(CVaapiProcessedPicture &pic) override;
   void Flush() override;
   bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
   bool DoesSync() override;
   bool WantsPic() override;
+  bool UseVideoSurface() override;
+  void Discard(COutput *output, ReadyToDispose cb) override;
 protected:
   bool CheckSuccess(VAStatus status);
   void Dispose();
@@ -512,6 +519,8 @@
   int m_currentIdx;
   int m_frameCount;
   EINTERLACEMETHOD m_vppMethod;
+  ReadyToDispose m_cbDispose;
+  COutput *m_pOut = nullptr;
 };
 
 /**
@@ -526,10 +535,12 @@
   bool Init(EINTERLACEMETHOD method) override;
   bool AddPicture(CVaapiDecodedPicture &inPic) override;
   bool Filter(CVaapiProcessedPicture &outPic) override;
-  void ClearRef(VASurfaceID surf) override;
+  void ClearRef(CVaapiProcessedPicture &pic) override;
   void Flush() override;
   bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
   bool DoesSync() override;
+  bool UseVideoSurface() override;
+  void Discard(COutput *output, ReadyToDispose cb) override;
 protected:
   bool CheckSuccess(VAStatus status);
   void Close();
@@ -544,6 +555,9 @@
   VideoPicture m_DVDPic;
   double m_frametime;
   double m_lastOutPts;
+  ReadyToDispose m_cbDispose;
+  COutput *m_pOut;
+  int m_refsToPics = 0;
 };
 
 }

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

@@ -327,8 +327,9 @@
 
   buf.hasDisplayMetadata = picture.hasDisplayMetadata;
   buf.displayMetadata = picture.displayMetadata;
-  buf.hasLightMetadata = picture.hasLightMetadata;
   buf.lightMetadata = picture.lightMetadata;
+  if (picture.hasLightMetadata && picture.lightMetadata.MaxCLL)
+    buf.hasLightMetadata = picture.hasLightMetadata;
 }
 
 void CLinuxRendererGL::ReleaseBuffer(int idx)
@@ -547,7 +548,12 @@
     m_iYV12RenderBuffer = index;
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
+
+    if (m_pYUVShader)
+      m_pYUVShader->SetAlpha(alpha/255/2);
+    if (m_pVideoFilterShader)
+      m_pVideoFilterShader->SetAlpha(alpha/255/2);
+
     Render(flags, m_iYV12RenderBuffer);
   }
 
@@ -810,7 +816,7 @@
   case VS_SCALINGMETHOD_SPLINE36_FAST:
     {
       EShaderFormat fmt = GetShaderFormat();
-      if (fmt == SHADER_NV12 || fmt == SHADER_YV12)
+      if (fmt == SHADER_NV12 || (fmt >= SHADER_YV12 && fmt <= SHADER_YV12_16))
       {
         unsigned int major, minor;
         m_renderSystem->GetRenderVersion(major, minor);

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

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

@@ -143,7 +143,7 @@
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_U].pData), 0x200, m_rects[PLANE_U].RowPitch * (m_heightTex >> 1) >> 1);
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_V].pData), 0x200, m_rects[PLANE_V].RowPitch * (m_heightTex >> 1) >> 1);
     break;
-  case BUFFER_FMT_YUV420P16: 
+  case BUFFER_FMT_YUV420P16:
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_Y].pData),      0, m_rects[PLANE_Y].RowPitch * m_heightTex >> 1);
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_U].pData), 0x8000, m_rects[PLANE_U].RowPitch * (m_heightTex >> 1) >> 1);
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_V].pData), 0x8000, m_rects[PLANE_V].RowPitch * (m_heightTex >> 1) >> 1);
@@ -168,7 +168,7 @@
     wmemset(uvData, 0x200, m_rects[PLANE_D3D11].RowPitch * (m_heightTex >> 1) >> 1);
     break;
   }
-  case BUFFER_FMT_D3D11_P016: 
+  case BUFFER_FMT_D3D11_P016:
   {
     wchar_t* uvData = static_cast<wchar_t*>(m_rects[PLANE_D3D11].pData) + m_rects[PLANE_D3D11].RowPitch * (m_heightTex >> 1);
     wmemset(static_cast<wchar_t*>(m_rects[PLANE_D3D11].pData), 0, m_rects[PLANE_D3D11].RowPitch * m_heightTex >> 1);
@@ -346,8 +346,9 @@
 
   hasDisplayMetadata = picture.hasDisplayMetadata;
   displayMetadata = picture.displayMetadata;
-  hasLightMetadata = picture.hasLightMetadata;
   lightMetadata = picture.lightMetadata;
+  if (picture.hasLightMetadata && picture.lightMetadata.MaxCLL)
+    hasLightMetadata = true;
 
   if (picture.videoBuffer->GetFormat() == AV_PIX_FMT_D3D11VA_VLD)
     QueueCopyBuffer();
@@ -459,7 +460,7 @@
   uint8_t* dst[] = {pData, pData + m_heightTex * rect.RowPitch};
   int dstStride[] = {rect.RowPitch, rect.RowPitch};
   // source
-  uint8_t* src[3]; 
+  uint8_t* src[3];
   videoBuffer->GetPlanes(src);
   int srcStrides[3];
   videoBuffer->GetStrides(srcStrides);
@@ -480,7 +481,7 @@
         // copy UV
         copy_plane(src[1], srcStrides[1], height >> 1, width, dst[1], dstStride[1]);
       });
-    // copy cache size of UV line again to fix Intel cache issue 
+    // copy cache size of UV line again to fix Intel cache issue
     copy_plane(src[1], srcStrides[1], 1, 32, dst[1], dstStride[1]);
   }
   // convert 8bit
@@ -493,7 +494,7 @@
         // convert U+V -> UV
         convert_yuv420_nv12_chrome(&src[1], &srcStrides[1], height, width, dst[1], dstStride[1]);
       });
-    // copy cache size of UV line again to fix Intel cache issue 
+    // copy cache size of UV line again to fix Intel cache issue
     // height and width multiplied by two because they will be divided by func
     convert_yuv420_nv12_chrome(&src[1], &srcStrides[1], 2, 64, dst[1], dstStride[1]);
   }
@@ -509,7 +510,7 @@
         // convert U+V -> UV
         convert_yuv420_p01x_chrome(&src[1], &srcStrides[1], height, width, dst[1], dstStride[1], bpp);
       });
-    // copy cache size of UV line again to fix Intel cache issue 
+    // copy cache size of UV line again to fix Intel cache issue
     // height multiplied by two because it will be divided by func
     convert_yuv420_p01x_chrome(&src[1], &srcStrides[1], 2, 32, dst[1], dstStride[1], bpp);
   }
@@ -672,7 +673,7 @@
       tasks.push_back(task);
     }
 
-    // event based await is required on WinRT because 
+    // event based await is required on WinRT because
     // blocking WinRT STA threads with task.wait() isn't allowed
     auto sync = std::make_shared<Concurrency::event>();
     when_all(tasks.begin(), tasks.end()).then([&sync]() {

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Monitor.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowVisualisation.cpp Changed

@@ -27,7 +27,6 @@
 #include "GUIUserMessages.h"
 #include "GUIInfoManager.h"
 #include "guilib/GUIWindowManager.h"
-#include "input/InputManager.h"
 #include "input/Key.h"
 #include "pvr/PVRGUIActions.h"
 #include "pvr/PVRManager.h"
@@ -50,17 +49,9 @@
 
 bool CGUIWindowVisualisation::OnAction(const CAction &action)
 {
-  if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) &&
-      CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().IsPreview() &&
-      (action.GetID() == ACTION_SELECT_ITEM ||
-       CServiceBroker::GetInputManager().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM))
-  {
-    // If confirm channel switch is active, channel preview is currently shown
-    // and the button that caused this action matches (global) action "Select" (OK)
-    // switch to the channel currently displayed within the preview.
-    CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().SwitchToCurrentChannel();
+  // Handle some actions "overloaded" by PVR (e.g. channel preview, direct channel number input).
+  if (CServiceBroker::GetPVRManager().GUIActions()->OnAction(action))
     return true;
-  }
 
   bool passToVis = false;
   switch (action.GetID())

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

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

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

@@ -32,6 +32,7 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
+#include "input/InputManager.h"
 #include "input/Key.h"
 #include "messaging/ApplicationMessenger.h"
 #include "network/Network.h"
@@ -157,6 +158,7 @@
       CSettings::SETTING_PVRMANAGER_PRESELECTPLAYINGCHANNEL,
       CSettings::SETTING_PVRRECORD_INSTANTRECORDTIME,
       CSettings::SETTING_PVRRECORD_INSTANTRECORDACTION,
+      CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH,
       CSettings::SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN,
       CSettings::SETTING_PVRPARENTAL_PIN,
       CSettings::SETTING_PVRPARENTAL_ENABLED,
@@ -1121,11 +1123,6 @@
 
   bool CPVRGUIActions::SwitchToChannel(const CFileItemPtr &item, bool bCheckResume) const
   {
-    return SwitchToChannel(item, bCheckResume, m_settings.GetBoolValue(CSettings::SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN));
-  }
-
-  bool CPVRGUIActions::SwitchToChannel(const CFileItemPtr &item, bool bCheckResume, bool bFullscreen) const
-  {
     if (item->m_bIsFolder)
       return false;
 
@@ -1163,7 +1160,7 @@
         }
       }
 
-      StartPlayback(new CFileItem(channel), bFullscreen);
+      StartPlayback(new CFileItem(channel), m_settings.GetBoolValue(CSettings::SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN));
       return true;
     }
 
@@ -1266,7 +1263,7 @@
 
     CLog::Log(LOGNOTICE, "PVRGUIActions - %s - start playback of channel '%s'", __FUNCTION__, item->GetPVRChannelInfoTag()->ChannelName().c_str());
     CServiceBroker::GetPVRManager().SetPlayingGroup(group);
-    return SwitchToChannel(item, true, m_settings.GetBoolValue(CSettings::SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN));
+    return SwitchToChannel(item, true);
   }
 
   bool CPVRGUIActions::PlayMedia(const CFileItemPtr &item) const
@@ -1834,6 +1831,29 @@
     return m_channelNavigator;
   }
 
+  bool CPVRGUIActions::OnAction(const CAction &action)
+  {
+    // If the button that caused this action matches (global) action "Select" (OK)...
+    if (action.GetID() == ACTION_SELECT_ITEM ||
+        CServiceBroker::GetInputManager().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM)
+    {
+      if (m_settings.GetBoolValue(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) &&
+          GetChannelNavigator().IsPreview())
+      {
+        // ... and if "confirm channel switch" setting is active and a channel
+        // preview is currently shown, switch to the currently previewed channel.
+        GetChannelNavigator().SwitchToCurrentChannel();
+        return true;
+      }
+      else if (GetChannelNumberInputHandler().CheckInputAndExecuteAction())
+      {
+        // ... and action was processed by direct channel number input, we're done.
+          return true;
+      }
+    }
+    return false;
+  }
+
   void CPVRGUIActions::OnPlaybackStarted(const CFileItemPtr &item)
   {
     if (item->HasPVRChannelInfoTag())

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

@@ -29,6 +29,7 @@
 #include "pvr/PVRSettings.h"
 #include "pvr/PVRTypes.h"
 
+class CAction;
 class CFileItem;
 typedef std::shared_ptr<CFileItem> CFileItemPtr;
 
@@ -373,6 +374,12 @@
     CPVRGUIChannelNavigator &GetChannelNavigator();
 
     /*!
+     * @brief Process an action.
+     * @return True if the action was processed, false otherwise.
+     */
+    bool OnAction(const CAction &action);
+
+    /*!
      * @brief Inform GUI actions that playback of an item just started.
      * @param item The item that started to play.
      */
@@ -474,15 +481,6 @@
     void CheckAndSwitchToFullscreen(bool bFullscreen) const;
 
     /*!
-     * @brief Switch channel.
-     * @param item containing a channel or an epg tag.
-     * @param bCheckResume controls resume check in case a recording for the current epg event is present.
-     * @param bFullscreen start playback fullscreen or not.
-     * @return true on success, false otherwise.
-     */
-    bool SwitchToChannel(const CFileItemPtr &item, bool bCheckResume, bool bFullscreen) const;
-
-    /*!
      * @brief Start playback of the given item.
      * @param bFullscreen start playback fullscreen or not.
      * @param item containing a channel or a recording.

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp Changed

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

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

_service:download_files:master.tar.gz/xbmc/settings/Settings.cpp Changed

@@ -172,6 +172,7 @@
 const std::string CSettings::SETTING_VIDEOPLAYER_USEOMXPLAYER = "videoplayer.useomxplayer";
 const std::string CSettings::SETTING_VIDEOPLAYER_USEVTB = "videoplayer.usevtb";
 const std::string CSettings::SETTING_VIDEOPLAYER_USEMMAL = "videoplayer.usemmal";
+const std::string CSettings::SETTING_VIDEOPLAYER_USEPRIMEDECODER = "videoplayer.useprimedecoder";
 const std::string CSettings::SETTING_VIDEOPLAYER_USESTAGEFRIGHT = "videoplayer.usestagefright";
 const std::string CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE = "videoplayer.limitguiupdate";
 const std::string CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC = "videoplayer.supportmvc";
@@ -588,6 +589,11 @@
 #endif
 #endif
 
+#if defined(PLATFORM_SETTINGS_FILE)
+  if (CFile::Exists(SETTINGS_XML_FOLDER DEF_TO_STR_VALUE(PLATFORM_SETTINGS_FILE)) && !Initialize(SETTINGS_XML_FOLDER DEF_TO_STR_VALUE(PLATFORM_SETTINGS_FILE)))
+    CLog::Log(LOGFATAL, "Unable to load platform-specific settings definitions (%s)", DEF_TO_STR_VALUE(PLATFORM_SETTINGS_FILE));
+#endif
+
   // load any custom visibility and default values before loading the special
   // appliance.xml so that appliances are able to overwrite even those values
   InitializeVisibility();

_service:download_files:master.tar.gz/xbmc/settings/Settings.h Changed

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

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowFullScreen.cpp Changed

@@ -43,7 +43,6 @@
 #include "threads/SingleLock.h"
 #include "utils/StringUtils.h"
 #include "XBDateTime.h"
-#include "input/InputManager.h"
 #include "windowing/WinSystem.h"
 #include "cores/IPlayer.h"
 #include "guiinfo/GUIInfoLabels.h"
@@ -95,17 +94,9 @@
 
 bool CGUIWindowFullScreen::OnAction(const CAction &action)
 {
-  if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) &&
-      CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().IsPreview() &&
-      (action.GetID() == ACTION_SELECT_ITEM ||
-       CServiceBroker::GetInputManager().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM))
-  {
-    // If confirm channel switch is active, channel preview is currently shown
-    // and the button that caused this action matches (global) action "Select" (OK)
-    // switch to the channel currently displayed within the preview.
-    CServiceBroker::GetPVRManager().GUIActions()->GetChannelNavigator().SwitchToCurrentChannel();
+  // Handle some actions "overloaded" by PVR (e.g. channel preview, direct channel number input).
+  if (CServiceBroker::GetPVRManager().GUIActions()->OnAction(action))
     return true;
-  }
 
   switch (action.GetID())
   {

Changes of Revision 61