VAAPI: Implement proper pause frame handling.

Refs #8593
MythTV · Jun 21, 2011 · e468ec9 · e468ec9
1 parent 0ffe5bb
commit e468ec9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_opengl.h b/mythtv/libs/libmythtv/videoout_opengl.h
@@ -27,7 +27,7 @@ class VideoOutputOpenGL : public VideoOutput
     virtual bool InputChanged(const QSize &input_size, float aspect,
                               MythCodecID  av_codec_id, void *codec_private,
                               bool &aspect_only);
-    void UpdatePauseFrame(void);
+    virtual void UpdatePauseFrame(void);
     void DrawUnusedRects(bool) { }
     void Zoom(ZoomDirection direction);
     void MoveResize(void);

diff --git a/mythtv/libs/libmythtv/videoout_openglvaapi.cpp b/mythtv/libs/libmythtv/videoout_openglvaapi.cpp
@@ -26,7 +26,7 @@ void VideoOutputOpenGLVAAPI::GetRenderOptions(render_opts &opts)
 }
 
 VideoOutputOpenGLVAAPI::VideoOutputOpenGLVAAPI()
-  : VideoOutputOpenGL(), m_ctx(NULL)
+  : VideoOutputOpenGL(), m_ctx(NULL), m_pauseBuffer(NULL)
 {
 }
 
@@ -229,6 +229,27 @@ int VideoOutputOpenGLVAAPI::SetPictureAttribute(PictureAttribute attribute,
     return VideoOutput::SetPictureAttribute(attribute, val);
 }
 
+void VideoOutputOpenGLVAAPI::UpdatePauseFrame(void)
+{
+    if (codec_is_std(video_codec_id))
+    {
+        VideoOutputOpenGLVAAPI::UpdatePauseFrame();
+        return;
+    }
+
+    vbuffers.begin_lock(kVideoBuffer_used);
+    if (vbuffers.size(kVideoBuffer_used))
+    {
+        VideoFrame *frame = vbuffers.head(kVideoBuffer_used);
+        m_pauseBuffer = frame->buf;
+    }
+    else
+        VERBOSE(VB_PLAYBACK, LOC +
+            QString("WARNING: Could not update pause frame - no used frames."));
+
+    vbuffers.end_lock();
+}
+
 void VideoOutputOpenGLVAAPI::ProcessFrame(VideoFrame *frame, OSD *osd,
                                           FilterChain *filterList,
                                           const PIPMap &pipPlayers,
@@ -237,10 +258,10 @@ void VideoOutputOpenGLVAAPI::ProcessFrame(VideoFrame *frame, OSD *osd,
     QMutexLocker locker(&gl_context_lock);
     VideoOutputOpenGL::ProcessFrame(frame, osd, filterList, pipPlayers, scan);
 
-    if (codec_is_vaapi(video_codec_id) && m_ctx && gl_videochain && frame)
+    if (codec_is_vaapi(video_codec_id) && m_ctx && gl_videochain)
     {
         gl_context->makeCurrent();
-        m_ctx->CopySurfaceToTexture(frame->buf,
+        m_ctx->CopySurfaceToTexture(frame ? frame->buf : m_pauseBuffer,
                                     gl_videochain->GetInputTexture(),
                                     gl_videochain->GetTextureType(), scan);
         gl_videochain->SetInputUpdated();

diff --git a/mythtv/libs/libmythtv/videoout_openglvaapi.h b/mythtv/libs/libmythtv/videoout_openglvaapi.h
@@ -25,6 +25,7 @@ class VideoOutputOpenGLVAAPI : public VideoOutputOpenGL
     bool  InputChanged(const QSize &input_size, float aspect,
                        MythCodecID  av_codec_id, void *codec_private,
                        bool &aspect_only);
+    virtual void UpdatePauseFrame(void);
     void  ProcessFrame(VideoFrame *frame, OSD *osd,
                        FilterChain *filterList,
                        const PIPMap &pipPlayers,
@@ -44,6 +45,7 @@ class VideoOutputOpenGLVAAPI : public VideoOutputOpenGL
 
   private:
     VAAPIContext *m_ctx;
+    void         *m_pauseBuffer;
 };
 #endif // VIDEOOUTPUTOPENGLVAAPI_H