Merge pull request xbmc#24402 from enen92/reset_data_cache

Players: Always reset CDataCacheCore on close file
ksooo · Jan 8, 2024 · 050d2af · 050d2af
2 parents bc828f2 + 03e1bad
commit 050d2af
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 30 deletions.
diff --git a/xbmc/cores/DataCacheCore.cpp b/xbmc/cores/DataCacheCore.cpp
@@ -34,20 +34,27 @@ void CDataCacheCore::Reset()
 {
   {
     std::unique_lock<CCriticalSection> lock(m_stateSection);
-
-    m_stateInfo.m_speed = 1.0;
-    m_stateInfo.m_tempo = 1.0;
-    m_stateInfo.m_stateSeeking = false;
-    m_stateInfo.m_renderGuiLayer = false;
-    m_stateInfo.m_renderVideoLayer = false;
+    m_stateInfo = {};
     m_playerStateChanged = false;
   }
-
+  {
+    std::unique_lock<CCriticalSection> lock(m_videoPlayerSection);
+    m_playerVideoInfo = {};
+  }
+  {
+    std::unique_lock<CCriticalSection> lock(m_audioPlayerSection);
+    m_playerAudioInfo = {};
+  }
+  m_hasAVInfoChanges = false;
+  {
+    std::unique_lock<CCriticalSection> lock(m_renderSection);
+    m_renderInfo = {};
+  }
   {
     std::unique_lock<CCriticalSection> lock(m_contentSection);
-
     m_contentInfo.Reset();
   }
+  m_timeInfo = {};
 }
 
 bool CDataCacheCore::HasAVInfoChanges()

diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -118,7 +118,7 @@ bool CExternalPlayer::CloseFile(bool reopen)
     TerminateProcess(m_processInfo.hProcess, 1);
   }
 #endif
-
+  CServiceBroker::GetDataCacheCore().Reset();
   return true;
 }
 

diff --git a/xbmc/cores/RetroPlayer/RetroPlayer.cpp b/xbmc/cores/RetroPlayer/RetroPlayer.cpp
@@ -258,8 +258,11 @@ bool CRetroPlayer::CloseFile(bool reopen /* = false */)
   m_gameClient.reset();
 
   m_renderManager.reset();
+  if (m_processInfo)
+  {
+    m_processInfo->ResetInfo();
+  }
   m_processInfo.reset();
-
   CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Playback ended");
   m_callback.OnPlayBackEnded();
 

diff --git a/xbmc/cores/RetroPlayer/process/RPProcessInfo.cpp b/xbmc/cores/RetroPlayer/process/RPProcessInfo.cpp
@@ -140,22 +140,7 @@ void CRPProcessInfo::ResetInfo()
 {
   if (m_dataCache != nullptr)
   {
-    m_dataCache->SetVideoDecoderName("", false);
-    m_dataCache->SetVideoDeintMethod("");
-    m_dataCache->SetVideoPixelFormat("");
-    m_dataCache->SetVideoDimensions(0, 0);
-    m_dataCache->SetVideoFps(0.0f);
-    m_dataCache->SetVideoDAR(1.0f);
-    m_dataCache->SetAudioDecoderName("");
-    m_dataCache->SetAudioChannels("");
-    m_dataCache->SetAudioSampleRate(0);
-    m_dataCache->SetAudioBitsPerSample(0);
-    m_dataCache->SetRenderClockSync(false);
-    m_dataCache->SetStateSeeking(false);
-    m_dataCache->SetSpeed(1.0f, 1.0f);
-    m_dataCache->SetGuiRender(true); //! @todo
-    m_dataCache->SetVideoRender(false); //! @todo
-    m_dataCache->SetPlayTimes(0, 0, 0, 0);
+    m_dataCache->Reset();
   }
 }
 

diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -729,9 +729,7 @@ bool CVideoPlayer::CloseFile(bool reopen)
   }
 
   m_Edl.Clear();
-  CServiceBroker::GetDataCacheCore().SetEditList(m_Edl.GetEditList());
-  CServiceBroker::GetDataCacheCore().SetCuts(m_Edl.GetCutMarkers());
-  CServiceBroker::GetDataCacheCore().SetSceneMarkers(m_Edl.GetSceneMarkers());
+  CServiceBroker::GetDataCacheCore().Reset();
 
   m_HasVideo = false;
   m_HasAudio = false;

diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -543,7 +543,7 @@ bool PAPlayer::CloseFile(bool reopen)
       lock.lock();
     }
   }
-
+  CServiceBroker::GetDataCacheCore().Reset();
   return true;
 }
 

diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp
@@ -463,9 +463,11 @@ bool CUPnPPlayer::CloseFile(bool reopen)
     m_callback.OnPlayBackStopped();
   }
   StopThread(true);
+  CServiceBroker::GetDataCacheCore().Reset();
   return true;
 failed:
   m_logger->error("CloseFile - unable to stop playback");
+  CServiceBroker::GetDataCacheCore().Reset();
   return false;
 }