Merge pull request xbmc#24940 from notspiff/add_video_fileitem_classify

Start moving video fileitem classifiers to separate file

xbmc/Autorun.cpp

@@ -31,6 +31,7 @@
 #include "settings/SettingsComponent.h"
 #include "settings/lib/Setting.h"
 #include "settings/lib/SettingDefinitions.h"
+#include "video/VideoFileItemClassify.h"
 
 #include <stdlib.h>
 #ifndef TARGET_WINDOWS
@@ -51,6 +52,7 @@
 using namespace XFILE;
 using namespace MEDIA_DETECT;
 using namespace KODI::MESSAGING;
+using namespace KODI::VIDEO;
 using namespace std::chrono_literals;
 
 using KODI::MESSAGING::HELPERS::DialogResponse;
@@ -399,7 +401,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
     for (int i = 0; i < tempItems.Size(); i++)
     {
       CFileItemPtr pItem = tempItems[i];
-      if (!pItem->m_bIsFolder && pItem->IsVideo())
+      if (!pItem->m_bIsFolder && IsVideo(*pItem))
       {
         bPlaying = true;
         if (pItem->IsStack())

xbmc/FileItem.cpp

@@ -59,6 +59,7 @@
 #include "utils/log.h"
 #include "video/Bookmark.h"
 #include "video/VideoDatabase.h"
+#include "video/VideoFileItemClassify.h"
 #include "video/VideoInfoTag.h"
 #include "video/VideoUtils.h"
 
@@ -68,6 +69,7 @@
 #include <mutex>
 
 using namespace KODI;
+using namespace KODI::VIDEO;
 using namespace XFILE;
 using namespace PLAYLIST;
 using namespace MUSIC_INFO;
@@ -873,51 +875,6 @@ bool CFileItem::Exists(bool bUseCache /* = true */) const
   return false;
 }
 
-bool CFileItem::IsVideo() const
-{
-  /* check preset mime type */
-  if(StringUtils::StartsWithNoCase(m_mimetype, "video/"))
-    return true;
-
-  if (HasVideoInfoTag())
-    return true;
-
-  if (HasGameInfoTag())
-    return false;
-
-  if (HasMusicInfoTag())
-    return false;
-
-  if (HasPictureInfoTag())
-    return false;
-
-  // TV recordings are videos...
-  if (!m_bIsFolder && URIUtils::IsPVRTVRecordingFileOrFolder(GetPath()))
-    return true;
-
-  // ... all other PVR items are not.
-  if (IsPVR())
-    return false;
-
-  if (URIUtils::IsDVD(m_strPath))
-    return true;
-
-  std::string extension;
-  if(StringUtils::StartsWithNoCase(m_mimetype, "application/"))
-  { /* check for some standard types */
-    extension = m_mimetype.substr(12);
-    if( StringUtils::EqualsNoCase(extension, "ogg")
-     || StringUtils::EqualsNoCase(extension, "mp4")
-     || StringUtils::EqualsNoCase(extension, "mxf") )
-     return true;
-  }
-
-  //! @todo If the file is a zip file, ask the game clients if any support this
-  // file before assuming it is video.
-
-  return URIUtils::HasExtension(m_strPath, CServiceBroker::GetFileExtensionProvider().GetVideoExtensions());
-}
-
 bool CFileItem::IsEPG() const
 {
   return HasEPGInfoTag();
@@ -1477,7 +1434,7 @@ void CFileItem::FillInDefaultIcon()
         // audio
         SetArt("icon", "DefaultAudio.png");
       }
-      else if ( IsVideo() )
+      else if (IsVideo(*this))
       {
         // video
         SetArt("icon", "DefaultVideo.png");
@@ -1866,7 +1823,7 @@ void CFileItem::MergeInfo(const CFileItem& item)
     SetLabel2(item.GetLabel2());
   if (!item.GetArt().empty())
   {
-    if (item.IsVideo())
+    if (IsVideo(item))
       AppendArt(item.GetArt());
     else
       SetArt(item.GetArt());
@@ -3809,7 +3766,7 @@ bool CFileItem::LoadDetails()
     return false;
   }
 
-  if (!IsPlayList() && IsVideo())
+  if (!IsPlayList() && IsVideo(*this))
   {
     if (HasVideoInfoTag())
       return true;
@@ -3841,7 +3798,7 @@ bool CFileItem::LoadDetails()
       if (playlist->Load(GetPath()) && playlist->size() == 1)
       {
         const auto item{(*playlist)[0]};
-        if (item->IsVideo())
+        if (IsVideo(*item))
         {
           CVideoDatabase db;
           if (!db.Open())

xbmc/FileItem.h

@@ -156,13 +156,6 @@ class CFileItem :
 
   bool Exists(bool bUseCache = true) const;
 
-  /*!
-   \brief Check whether an item is a video item. Note that this returns true for
-    anything with a video info tag, so that may include eg. folders.
-   \return true if item is video, false otherwise.
-   */
-  bool IsVideo() const;
-
   bool IsDiscStub() const;
 
   /*!

xbmc/PlayListPlayer.cpp

@@ -37,9 +37,11 @@
 #include "utils/Variant.h"
 #include "utils/log.h"
 #include "video/VideoDatabase.h"
+#include "video/VideoFileItemClassify.h"
 
 using namespace PLAYLIST;
 using namespace KODI::MESSAGING;
+using namespace KODI::VIDEO;
 
 CPlayListPlayer::CPlayListPlayer(void)
 {
@@ -266,7 +268,7 @@ bool CPlayListPlayer::PlayItemIdx(int itemIdx)
 bool CPlayListPlayer::Play(const CFileItemPtr& pItem, const std::string& player)
 {
   Id playlistId;
-  bool isVideo{pItem->IsVideo()};
+  bool isVideo{IsVideo(*pItem)};
   bool isAudio{pItem->IsAudio()};
 
   if (isAudio && !isVideo)
@@ -949,7 +951,7 @@ void PLAYLIST::CPlayListPlayer::OnApplicationMessage(KODI::MESSAGING::ThreadMess
         Id playlistId = TYPE_MUSIC;
         for (int i = 0; i < list->Size(); i++)
         {
-          if ((*list)[i]->IsVideo())
+          if (IsVideo(*list->Get(i)))
           {
             playlistId = TYPE_VIDEO;
             break;
@@ -967,7 +969,7 @@ void PLAYLIST::CPlayListPlayer::OnApplicationMessage(KODI::MESSAGING::ThreadMess
           {
             return;
           }
-          if (item->IsAudio() || item->IsVideo())
+          if (item->IsAudio() || IsVideo(*item))
             Play(item, pMsg->strParam);
           else
             g_application.PlayMedia(*item, pMsg->strParam, playlistId);

xbmc/Util.cpp

@@ -7,6 +7,7 @@
  */
 
 #include "network/Network.h"
+#include "video/VideoFileItemClassify.h"
 #if defined(TARGET_DARWIN)
 #include <sys/param.h>
 #include <mach-o/dyld.h>
@@ -92,6 +93,7 @@ using namespace MEDIA_DETECT;
 using namespace XFILE;
 using namespace PLAYLIST;
 using KODI::UTILITY::CDigest;
+using namespace KODI::VIDEO;
 
 #if !defined(TARGET_WINDOWS)
 unsigned int CUtil::s_randomSeed = time(NULL);
@@ -2054,10 +2056,8 @@ void CUtil::ScanForExternalSubtitles(const std::string& strMovie, std::vector<st
   auto start = std::chrono::steady_clock::now();
 
   CFileItem item(strMovie, false);
-  if ((item.IsInternetStream() && !URIUtils::IsOnLAN(item.GetDynPath()))
-    || item.IsPlayList()
-    || item.IsLiveTV()
-    || !item.IsVideo())
+  if ((item.IsInternetStream() && !URIUtils::IsOnLAN(item.GetDynPath())) || item.IsPlayList() ||
+      item.IsLiveTV() || !IsVideo(item))
     return;
 
   CLog::Log(LOGDEBUG, "{}: Searching for subtitles...", __FUNCTION__);
@@ -2346,11 +2346,8 @@ std::string CUtil::GetVobSubIdxFromSub(const std::string& vobSub)
 void CUtil::ScanForExternalAudio(const std::string& videoPath, std::vector<std::string>& vecAudio)
 {
   CFileItem item(videoPath, false);
-  if ( item.IsInternetStream()
-   ||  item.IsPlayList()
-   ||  item.IsLiveTV()
-   ||  item.IsPVR()
-   || !item.IsVideo())
+  if (item.IsInternetStream() || item.IsPlayList() || item.IsLiveTV() || item.IsPVR() ||
+      !IsVideo(item))
     return;
 
   std::string strBasePath;

xbmc/application/Application.cpp

@@ -60,6 +60,7 @@
 #include "filesystem/DirectoryFactory.h"
 #include "filesystem/DllLibCurl.h"
 #include "filesystem/File.h"
+#include "video/VideoFileItemClassify.h"
 #ifdef HAS_FILESYSTEM_NFS
 #include "filesystem/NFSFile.h"
 #endif
@@ -198,6 +199,7 @@ using namespace PVR;
 using namespace PERIPHERALS;
 using namespace KODI;
 using namespace KODI::MESSAGING;
+using namespace KODI::VIDEO;
 using namespace ActiveAE;
 
 using namespace XbmcThreads;
@@ -2301,7 +2303,7 @@ bool CApplication::PlayFile(CFileItem item, const std::string& player, bool bRes
     m_nextPlaylistItem = -1;
     stackHelper->Clear();
 
-    if (item.IsVideo())
+    if (IsVideo(item))
       CUtil::ClearSubtitles();
   }
 
@@ -2346,7 +2348,7 @@ bool CApplication::PlayFile(CFileItem item, const std::string& player, bool bRes
   {
     // the following code block is only applicable when bRestart is false OR to ISO stacks
 
-    if (item.IsVideo())
+    if (IsVideo(item))
     {
       // open the d/b and retrieve the bookmarks for the current movie
       CVideoDatabase dbs;
@@ -2458,7 +2460,7 @@ bool CApplication::PlayFile(CFileItem item, const std::string& player, bool bRes
         CSettings::SETTING_MUSICFILES_SELECTACTION) &&
         !CMediaSettings::GetInstance().DoesMediaStartWindowed();
   }
-  else if (item.IsVideo() && playlistId == PLAYLIST::TYPE_VIDEO &&
+  else if (IsVideo(item) && playlistId == PLAYLIST::TYPE_VIDEO &&
            CServiceBroker::GetPlaylistPlayer().GetPlaylist(playlistId).size() > 1)
   { // playing from a playlist by the looks
     // don't switch to fullscreen if we are not playing the first item...
@@ -2783,9 +2785,9 @@ bool CApplication::OnMessage(CGUIMessage& message)
       bool bNothingToQueue = false;
 
       const auto appPlayer = GetComponent<CApplicationPlayer>();
-      if (!file.IsVideo() && appPlayer->IsPlayingVideo())
+      if (!IsVideo(file) && appPlayer->IsPlayingVideo())
         bNothingToQueue = true;
-      else if ((!file.IsAudio() || file.IsVideo()) && appPlayer->IsPlayingAudio())
+      else if ((!file.IsAudio() || IsVideo(file)) && appPlayer->IsPlayingAudio())
         bNothingToQueue = true;
 
       if (bNothingToQueue)
@@ -3053,7 +3055,7 @@ bool CApplication::ExecuteXBMCAction(std::string actionStr,
     }
     else
 #endif
-    if (item.IsAudio() || item.IsVideo() || item.IsGame())
+        if (item.IsAudio() || IsVideo(item) || item.IsGame())
     { // an audio or video file
       PlayFile(item, "");
     }
@@ -3174,10 +3176,8 @@ void CApplication::ProcessSlow()
 
   // Temporarily pause pausable jobs when viewing video/picture
   int currentWindow = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
-  if (CurrentFileItem().IsVideo() ||
-      CurrentFileItem().IsPicture() ||
-      currentWindow == WINDOW_FULLSCREEN_VIDEO ||
-      currentWindow == WINDOW_FULLSCREEN_GAME ||
+  if (IsVideo(CurrentFileItem()) || CurrentFileItem().IsPicture() ||
+      currentWindow == WINDOW_FULLSCREEN_VIDEO || currentWindow == WINDOW_FULLSCREEN_GAME ||
       currentWindow == WINDOW_SLIDESHOW)
   {
     CServiceBroker::GetJobManager()->PauseJobs();

xbmc/application/ApplicationPlayerCallback.cpp

@@ -32,10 +32,13 @@
 #include "utils/URIUtils.h"
 #include "utils/log.h"
 #include "video/VideoDatabase.h"
+#include "video/VideoFileItemClassify.h"
 #include "video/VideoInfoTag.h"
 
 #include <memory>
 
+using namespace KODI::VIDEO;
+
 CApplicationPlayerCallback::CApplicationPlayerCallback()
 {
 }
@@ -80,7 +83,7 @@ void CApplicationPlayerCallback::OnPlayBackStarted(const CFileItem& file)
    * This should speed up player startup for files on internet filesystems (eg. webdav) and
    * increase performance on low powered systems (Atom/ARM).
    */
-  if (file.IsVideo() || file.IsGame())
+  if (IsVideo(file) || file.IsGame())
   {
     CServiceBroker::GetJobManager()->PauseJobs();
   }
@@ -128,7 +131,7 @@ void CApplicationPlayerCallback::OnPlayerCloseFile(const CFileItem& file,
 
   if ((fileItem.IsAudio() && advancedSettings->m_audioPlayCountMinimumPercent > 0 &&
        percent >= advancedSettings->m_audioPlayCountMinimumPercent) ||
-      (fileItem.IsVideo() && advancedSettings->m_videoPlayCountMinimumPercent > 0 &&
+      (IsVideo(fileItem) && advancedSettings->m_videoPlayCountMinimumPercent > 0 &&
        percent >= advancedSettings->m_videoPlayCountMinimumPercent))
   {
     playCountUpdate = true;

xbmc/cores/playercorefactory/PlayerCoreFactory.cpp

@@ -25,12 +25,15 @@
 #include "utils/StringUtils.h"
 #include "utils/XMLUtils.h"
 #include "utils/log.h"
+#include "video/VideoFileItemClassify.h"
 
 #include <mutex>
 #include <sstream>
 
 #define PLAYERCOREFACTORY_XML "playercorefactory.xml"
 
+using namespace KODI;
+
 CPlayerCoreFactory::CPlayerCoreFactory(const CProfileManager& profileManager)
   : m_settings(CServiceBroker::GetSettingsComponent()->GetSettings()),
     m_profileManager(profileManager)
@@ -141,7 +144,7 @@ void CPlayerCoreFactory::GetPlayers(const CFileItem& item, std::vector<std::stri
   // "videodefaultplayer"
   if (defaultInputstreamPlayerOverride == ForcedPlayer::VIDEO_DEFAULT ||
       (defaultInputstreamPlayerOverride == ForcedPlayer::NONE &&
-       (item.IsVideo() || (!item.IsAudio() && !item.IsGame()))))
+       (VIDEO::IsVideo(item) || (!item.IsAudio() && !item.IsGame()))))
   {
     int idx = GetPlayerIndex("videodefaultplayer");
     if (idx > -1)

xbmc/cores/playercorefactory/PlayerSelectionRule.cpp

@@ -19,10 +19,13 @@
 #include "utils/XBMCTinyXML.h"
 #include "utils/XMLUtils.h"
 #include "utils/log.h"
+#include "video/VideoFileItemClassify.h"
 #include "video/VideoInfoTag.h"
 
 #include <algorithm>
 
+using namespace KODI;
+
 CPlayerSelectionRule::CPlayerSelectionRule(TiXmlElement* pRule)
 {
   Initialize(pRule);
@@ -116,7 +119,7 @@ void CPlayerSelectionRule::GetPlayers(const CFileItem& item, std::vector<std::st
     return;
   if (m_tAudio >= 0 && (m_tAudio > 0) != item.IsAudio())
     return;
-  if (m_tVideo >= 0 && (m_tVideo > 0) != item.IsVideo())
+  if (m_tVideo >= 0 && (m_tVideo > 0) != VIDEO::IsVideo(item))
     return;
   if (m_tGame >= 0 && (m_tGame > 0) != item.IsGame())
     return;