Merge pull request xbmc#441 from FernetMenta/mainline

video player: do not call render functions from video thread, fix segfault
maoueh · Sep 29, 2011 · 156e9ed · 156e9ed
2 parents 09c7df8 + 57db2e4
commit 156e9ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -356,6 +356,11 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
     m_filename = file.GetPath();
 
     m_ready.Reset();
+
+#if defined(HAS_VIDEO_PLAYBACK)
+    g_renderManager.PreInit();
+#endif
+
     Create();
     if(!m_ready.WaitMSec(100))
     {

diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -178,11 +178,6 @@ bool CDVDPlayerVideo::OpenStream( CDVDStreamInfo &hint )
 {
   unsigned int surfaces = 0;
 #ifdef HAS_VIDEO_PLAYBACK
-  if(!m_output.inited)
-  {
-    g_renderManager.PreInit();
-    m_output.inited = true;
-  }
   surfaces = g_renderManager.GetProcessorSize();
 #endif
 
@@ -750,8 +745,6 @@ void CDVDPlayerVideo::OnExit()
     m_pOverlayCodecCC = NULL;
   }
 
-  m_output.inited = false;
-
   CLog::Log(LOGNOTICE, "thread end: video_thread");
 }
 

diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h
@@ -159,7 +159,6 @@ class CDVDPlayerVideo : public CThread
     unsigned int color_primaries;
     unsigned int color_transfer;
     double       framerate;
-    bool         inited;
   } m_output; //holds currently configured output
 
   bool m_bAllowFullscreen;