Ticket #6618: 6618-vout_d3d_reinit.patch

libs/libmythtv/videoout_d3d.cpp

@@ -188 +188 @@
     QMutexLocker locker(&m_lock);
     D3DCAPS9 d3dCaps;
 
+    UnInitD3D();
+
     typedef LPDIRECT3D9 (WINAPI *LPFND3DC)(UINT SDKVersion);
     static LPFND3DC OurDirect3DCreate9 = NULL;
     static HINSTANCE hD3DLib = NULL;
@@ -258 +260 @@
     d3dpp.hDeviceWindow          = m_hWnd;
     d3dpp.Windowed               = TRUE;
     d3dpp.BackBufferWidth        = m_InputCX;
-    d3dpp.BackBufferHeight       = m_InputCX;
+    d3dpp.BackBufferHeight       = m_InputCY;
     d3dpp.BackBufferCount        = 1;
     d3dpp.MultiSampleType        = D3DMULTISAMPLE_NONE;
     d3dpp.SwapEffect             = D3DSWAPEFFECT_DISCARD;
@@ -522 +524 @@
         return;
     }
 
+    if (!m_pSurface)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "Picture surface not initialized");
+        return;
+    }
+
     if (!buffer)
         buffer = vbuffers.GetScratchFrame();
 
@@ -581 +589 @@
             switch (hr)
             {
                 case D3DERR_DEVICENOTRESET:
-                    VERBOSE(VB_IMPORTANT, LOC_ERR +
-                            "The device has been lost but can be reset "
-                            "at this time. TODO: implement device reset");
-                    // TODO: instead of goto renderError, reset the device
-                    //m_pd3dDevice->Reset(...
+                    VERBOSE(VB_IMPORTANT, LOC +
+                            "The device was lost and will be reset now.");
+                    InitD3D();
                     goto RenderError;
                 case D3DERR_DEVICELOST:
-                    VERBOSE(VB_IMPORTANT, LOC_ERR +
+                    VERBOSE(VB_PLAYBACK, LOC +
                             "The device has been lost and cannot be reset "
                             "at this time.");
                     goto RenderError;