MythNVDECInterop: Reset opengl textures when the frame size changes

- this is largely driven by how the FFmpeg nvdec decoder works - normally the interop would be deleted but under certain circumstances it just carries on with a new frame size
MythTV · May 21, 2019 · cb7fe54 · cb7fe54
1 parent 8737112
commit cb7fe54
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/mythtv/libs/libmythtv/mythnvdecinterop.cpp b/mythtv/libs/libmythtv/mythnvdecinterop.cpp
@@ -25,10 +25,22 @@ MythNVDECInterop::MythNVDECInterop(MythRenderOpenGL *Context)
 }
 
 MythNVDECInterop::~MythNVDECInterop()
+{
+    if (m_cudaFuncs)
+    {
+        if (m_cudaContext)
+            CUDA_CHECK(m_cudaFuncs->cuCtxDestroy(m_cudaContext));
+        cuda_free_functions(&m_cudaFuncs);
+    }
+}
+
+void MythNVDECInterop::DeleteTextures(void)
 {
     CUcontext dummy;
-    if (m_cudaContext && m_cudaFuncs)
-        CUDA_CHECK(m_cudaFuncs->cuCtxPushCurrent(m_cudaContext));
+    if (!(m_cudaContext && m_cudaFuncs))
+        return;
+
+    CUDA_CHECK(m_cudaFuncs->cuCtxPushCurrent(m_cudaContext));
 
     if (!m_openglTextures.isEmpty())
     {
@@ -51,15 +63,9 @@ MythNVDECInterop::~MythNVDECInterop()
         }
     }
 
-    if (m_cudaFuncs)
-    {
-        if (m_cudaContext)
-        {
-            CUDA_CHECK(m_cudaFuncs->cuCtxPopCurrent(&dummy));
-            CUDA_CHECK(m_cudaFuncs->cuCtxDestroy(m_cudaContext));
-        }
-        cuda_free_functions(&m_cudaFuncs);
-    }
+    CUDA_CHECK(m_cudaFuncs->cuCtxPopCurrent(&dummy));
+
+    MythOpenGLInterop::DeleteTextures();
 }
 
 bool MythNVDECInterop::IsValid(void)
@@ -114,7 +120,10 @@ vector<MythVideoTexture*> MythNVDECInterop::Acquire(MythRenderOpenGL *Context,
     if (m_openglTextureSize != surfacesize)
     {
         if (!m_openglTextureSize.isEmpty())
-            LOG(VB_GENERAL, LOG_WARNING, LOC + "Video texture size changed!");
+            LOG(VB_GENERAL, LOG_WARNING, LOC + QString("Video texture size changed! %1x%2->%3x%4")
+                .arg(m_openglTextureSize.width()).arg(m_openglTextureSize.height())
+                .arg(Frame->width).arg(Frame->height));
+        DeleteTextures();
         m_openglTextureSize = surfacesize;
     }
 

diff --git a/mythtv/libs/libmythtv/mythnvdecinterop.h b/mythtv/libs/libmythtv/mythnvdecinterop.h
@@ -28,6 +28,7 @@ class MythNVDECInterop : public MythOpenGLInterop
 
   private:
     bool           InitialiseCuda(void);
+    void           DeleteTextures(void) override;
 
     CUcontext      m_cudaContext;
     CudaFunctions *m_cudaFuncs;

diff --git a/mythtv/libs/libmythtv/mythopenglinterop.h b/mythtv/libs/libmythtv/mythopenglinterop.h
@@ -56,7 +56,7 @@ class MythOpenGLInterop : public QObject, public ReferenceCounter
 
   protected:
     explicit MythOpenGLInterop                (MythRenderOpenGL *Context, Type InteropType);
-    void     DeleteTextures                   (void);
+    virtual void DeleteTextures               (void);
 
   protected:
     MythRenderOpenGL   *m_context;