Merge pull request xbmc#24331 from ksooo/video-versions-fix-thumbnail…

…-load-perf

[video][dialogs] Video versions: Fix delay before "Convert to version" video select dialog opens

xbmc/BackgroundInfoLoader.cpp

@@ -15,20 +15,20 @@
 
 #include <mutex>
 
-CBackgroundInfoLoader::CBackgroundInfoLoader() : m_thread (NULL)
-{
-  m_bStop = true;
-  m_pObserver=NULL;
-  m_pProgressCallback=NULL;
-  m_pVecItems = NULL;
-  m_bIsLoading = false;
-}
+CBackgroundInfoLoader::CBackgroundInfoLoader() = default;
 
 CBackgroundInfoLoader::~CBackgroundInfoLoader()
 {
   StopThread();
 }
 
+void CBackgroundInfoLoader::Reset()
+{
+  m_pVecItems = nullptr;
+  m_vecItems.clear();
+  m_bIsLoading = false;
+}
+
 void CBackgroundInfoLoader::Run()
 {
   try
@@ -83,13 +83,13 @@ void CBackgroundInfoLoader::Run()
     }
 
     OnLoaderFinish();
-    m_bIsLoading = false;
   }
   catch (...)
   {
-    m_bIsLoading = false;
     CLog::Log(LOGERROR, "{} - Unhandled exception", __FUNCTION__);
   }
+
+  Reset();
 }
 
 void CBackgroundInfoLoader::Load(CFileItemList& items)
@@ -129,9 +129,7 @@ void CBackgroundInfoLoader::StopThread()
     delete m_thread;
     m_thread = NULL;
   }
-  m_vecItems.clear();
-  m_pVecItems = NULL;
-  m_bIsLoading = false;
+  Reset();
 }
 
 bool CBackgroundInfoLoader::IsLoading()

xbmc/BackgroundInfoLoader.h

@@ -48,15 +48,18 @@ class CBackgroundInfoLoader : public IRunnable
   virtual void OnLoaderStart() {}
   virtual void OnLoaderFinish() {}
 
-  CFileItemList *m_pVecItems;
+  CFileItemList* m_pVecItems{nullptr};
   std::vector<CFileItemPtr> m_vecItems; // FileItemList would delete the items and we only want to keep a reference.
   CCriticalSection m_lock;
 
-  volatile bool m_bIsLoading;
-  volatile bool m_bStop;
-  CThread *m_thread;
+  volatile bool m_bIsLoading{false};
+  volatile bool m_bStop{true};
+  CThread* m_thread{nullptr};
 
-  IBackgroundLoaderObserver* m_pObserver;
-  IProgressCallback* m_pProgressCallback;
+  IBackgroundLoaderObserver* m_pObserver{nullptr};
+  IProgressCallback* m_pProgressCallback{nullptr};
+
+private:
+  void Reset();
 };
 

xbmc/dialogs/GUIDialogSelect.cpp

@@ -203,9 +203,8 @@ int CGUIDialogSelect::Add(const CFileItem& item)
 
 void CGUIDialogSelect::SetItems(const CFileItemList& pList)
 {
-  // need to make internal copy of list to be sure dialog is owner of it
   m_vecList->Clear();
-  m_vecList->Copy(pList);
+  m_vecList->Append(pList);
 
   m_viewControl.SetItems(*m_vecList);
 }

xbmc/video/dialogs/GUIDialogVideoManager.cpp

@@ -310,7 +310,7 @@ void CGUIDialogVideoManager::Remove()
 
 void CGUIDialogVideoManager::Rename()
 {
-  const int idAsset{SelectVideoAsset(m_videoAsset)};
+  const int idAsset{ChooseVideoAsset(m_videoAsset)};
   if (idAsset != -1)
   {
     //! @todo db refactor: should not be version, but asset
@@ -338,7 +338,7 @@ void CGUIDialogVideoManager::SetSelectedVideoAsset(const std::shared_ptr<CFileIt
   UpdateControls();
 }
 
-int CGUIDialogVideoManager::SelectVideoAsset(const std::shared_ptr<CFileItem>& item)
+int CGUIDialogVideoManager::ChooseVideoAsset(const std::shared_ptr<CFileItem>& item)
 {
   if (!item || !item->HasVideoInfoTag())
     return -1;

xbmc/video/dialogs/GUIDialogVideoManager.h

@@ -50,7 +50,7 @@ class CGUIDialogVideoManager : public CGUIDialog
 
   void UpdateControls();
 
-  static int SelectVideoAsset(const std::shared_ptr<CFileItem>& item);
+  static int ChooseVideoAsset(const std::shared_ptr<CFileItem>& item);
 
   CVideoDatabase m_database;
   std::shared_ptr<CFileItem> m_videoAsset;

xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp

@@ -265,7 +265,7 @@ void CGUIDialogVideoManagerVersions::AddVideoVersion()
                  CURL::GetRedacted(item.GetPath()));
     }
 
-    const int idNewVideoVersion{SelectVideoAsset(m_videoAsset)};
+    const int idNewVideoVersion{ChooseVideoAsset(m_videoAsset)};
     if (idNewVideoVersion != -1)
       m_database.AddPrimaryVideoVersion(itemType, dbId, idNewVideoVersion, item);
 
@@ -372,6 +372,52 @@ int CGUIDialogVideoManagerVersions::ManageVideoVersionContextMenu(
   return button;
 }
 
+bool CGUIDialogVideoManagerVersions::ChooseVideoAndConvertToVideoVersion(
+    CFileItemList& items,
+    VideoDbContentType itemType,
+    const std::string& mediaType,
+    int dbId,
+    CVideoDatabase& videoDb)
+{
+  // choose a video
+  CGUIDialogSelect* dialog{CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(
+      WINDOW_DIALOG_SELECT)};
+  if (!dialog)
+  {
+    CLog::LogF(LOGERROR, "Unable to get WINDOW_DIALOG_SELECT instance!");
+    return {};
+  }
+
+  // Load thumbs async
+  CVideoThumbLoader loader;
+  loader.Load(items);
+
+  dialog->Reset();
+  dialog->SetItems(items);
+  dialog->SetHeading(CVariant{40002});
+  dialog->SetUseDetails(true);
+  dialog->Open();
+
+  if (loader.IsLoading())
+    loader.StopThread();
+
+  if (!dialog->IsConfirmed())
+    return false;
+
+  const std::shared_ptr<CFileItem> selectedItem{dialog->GetSelectedFileItem()};
+  if (!selectedItem)
+    return false;
+
+  // choose a video version for the video
+  const int idVideoVersion{ChooseVideoAsset(selectedItem)};
+  if (idVideoVersion < 0)
+    return false;
+
+  videoDb.ConvertVideoToVersion(itemType, dbId, selectedItem->GetVideoInfoTag()->m_iDbId,
+                                idVideoVersion);
+  return true;
+}
+
 bool CGUIDialogVideoManagerVersions::ConvertVideoVersion(const std::shared_ptr<CFileItem>& item)
 {
   if (!item || !item->HasVideoInfoTag())
@@ -428,41 +474,12 @@ bool CGUIDialogVideoManagerVersions::ConvertVideoVersion(const std::shared_ptr<C
   }
 
   // decorate the items
-  CVideoThumbLoader loader;
   for (const auto& item : list)
   {
-    loader.LoadItem(item.get());
     item->SetLabel2(item->GetVideoInfoTag()->m_strFileNameAndPath);
   }
 
-  // choose the target video
-  CGUIDialogSelect* dialog{CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(
-      WINDOW_DIALOG_SELECT)};
-  if (!dialog)
-  {
-    CLog::LogF(LOGERROR, "Unable to get WINDOW_DIALOG_SELECT instance!");
-    return false;
-  }
-
-  dialog->Reset();
-  dialog->SetItems(list);
-  dialog->SetHeading(CVariant{40002});
-  dialog->SetUseDetails(true);
-  dialog->Open();
-
-  if (!dialog->IsConfirmed())
-    return false;
-
-  const std::shared_ptr<CFileItem> selectedItem{dialog->GetSelectedFileItem()};
-
-  // choose a video version
-  const int idVideoVersion{SelectVideoAsset(selectedItem)};
-  if (idVideoVersion < 0)
-    return false;
-
-  videodb.ConvertVideoToVersion(itemType, dbId, selectedItem->GetVideoInfoTag()->m_iDbId,
-                                idVideoVersion);
-  return true;
+  return ChooseVideoAndConvertToVideoVersion(list, itemType, mediaType, dbId, videodb);
 }
 
 bool CGUIDialogVideoManagerVersions::ProcessVideoVersion(VideoDbContentType itemType, int dbId)
@@ -509,38 +526,10 @@ bool CGUIDialogVideoManagerVersions::ProcessVideoVersion(VideoDbContentType item
   }
 
   // decorate the items
-  CVideoThumbLoader loader;
   for (const auto& item : list)
   {
-    loader.LoadItem(item.get());
     item->SetLabel2(item->GetVideoInfoTag()->m_strFileNameAndPath);
   }
 
-  CGUIDialogSelect* dialog{CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(
-      WINDOW_DIALOG_SELECT)};
-  if (!dialog)
-  {
-    CLog::LogF(LOGERROR, "Unable to get WINDOW_DIALOG_SELECT instance!");
-    return false;
-  }
-
-  dialog->Reset();
-  dialog->SetItems(list);
-  dialog->SetHeading(CVariant{40002});
-  dialog->SetUseDetails(true);
-  dialog->Open();
-
-  if (!dialog->IsConfirmed())
-    return false;
-
-  const std::shared_ptr<CFileItem> selectedItem{dialog->GetSelectedFileItem()};
-
-  // choose a video version
-  const int idVideoVersion{SelectVideoAsset(selectedItem)};
-  if (idVideoVersion < 0)
-    return false;
-
-  videodb.ConvertVideoToVersion(itemType, dbId, selectedItem->GetVideoInfoTag()->m_iDbId,
-                                idVideoVersion);
-  return true;
+  return ChooseVideoAndConvertToVideoVersion(list, itemType, mediaType, dbId, videodb);
 }

xbmc/video/dialogs/GUIDialogVideoManagerVersions.h

@@ -49,5 +49,11 @@ class CGUIDialogVideoManagerVersions : public CGUIDialogVideoManager
   void SetDefault();
   void UpdateDefaultVideoVersionSelection();
 
+  static bool ChooseVideoAndConvertToVideoVersion(CFileItemList& items,
+                                                  VideoDbContentType itemType,
+                                                  const std::string& mediaType,
+                                                  int dbId,
+                                                  CVideoDatabase& videoDb);
+
   std::shared_ptr<CFileItem> m_defaultVideoVersion;
 };