VDPAU: Dummy frames third time lucky.

Author: Mark Kendall

mythtv/libs/libmythtv/videoout_vdpau.cpp

@@ -390,6 +390,18 @@ void VideoOutputVDPAU::ProcessFrame(VideoFrame *frame, OSD *osd,
     ShowPIPs(frame, pipPlayers);
 }
 
+void VideoOutputVDPAU::ClearDummyFrame(VideoFrame *frame)
+{
+    if (frame && m_render && !codec_is_std(video_codec_id))
+    {
+        struct vdpau_render_state *render =
+            (struct vdpau_render_state *)frame->buf;
+        if (render)
+            m_render->ClearVideoSurface(render->surface);
+    }
+    VideoOutput::ClearDummyFrame(frame);
+}
+
 void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame, FrameScanType scan,
                                     OSD *osd)
 {
@@ -420,7 +432,8 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame, FrameScanType scan,
     }
 
     uint video_surface = m_video_surfaces[0];
-    bool deint = (m_deinterlacing && m_need_deintrefs && frame);
+    bool deint = (m_deinterlacing && m_need_deintrefs &&
+                  frame && !dummy);
 
     if (deint)
     {
@@ -491,19 +504,16 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame, FrameScanType scan,
     if (size != m_render->GetSize())
         LOG(VB_GENERAL, LOG_ERR, LOC + "Unexpected display size.");
 
-    if (!dummy)
+    if (!m_render->MixAndRend(m_video_mixer, field, video_surface, 0,
+                              deint ? &m_reference_frames : NULL,
+                              scan == kScan_Interlaced,
+                              window.GetVideoRect(),
+                              QRect(QPoint(0,0), size),
+                              vsz_enabled ? vsz_desired_display_rect :
+                                            window.GetDisplayVideoRect(),
+                              m_pip_ready ? m_pip_layer : 0, 0))
     {
-        if (!m_render->MixAndRend(m_video_mixer, field, video_surface, 0,
-                                  deint ? &m_reference_frames : NULL,
-                                  scan == kScan_Interlaced,
-                                  window.GetVideoRect(),
-                                  QRect(QPoint(0,0), size),
-                                  vsz_enabled ? vsz_desired_display_rect :
-                                                window.GetDisplayVideoRect(),
-                                  m_pip_ready ? m_pip_layer : 0, 0))
-        {
-            LOG(VB_PLAYBACK, LOG_ERR, LOC + "Prepare frame failed.");
-        }
+        LOG(VB_PLAYBACK, LOG_ERR, LOC + "Prepare frame failed.");
     }
 
     if (m_visual)

mythtv/libs/libmythtv/videoout_vdpau.h

@@ -68,6 +68,7 @@ class VideoOutputVDPAU : public VideoOutput
         { return VideoOutput::CanVisualise(audio, m_render);       }
     virtual bool SetupVisualisation(AudioPlayer *audio, MythRender *render)
         { return VideoOutput::SetupVisualisation(audio, m_render); }
+    virtual void ClearDummyFrame(VideoFrame* frame);
 
   private:
     virtual bool hasFullScreenOSD(void) const { return true; }