Ticket #1842: cn400-mythtv-vid-video.patch

libs/libmythtv/videoout_xv.h

@@ -170 +170 @@
 
     bool CreateXvMCBuffers(void);
     bool CreateBuffers(VOSType subtype);
-    vector<void*> CreateXvMCSurfaces(uint num, bool create_xvmc_blocks);
+    vector<void*> CreateXvMCSurfaces(uint num, bool surface_has_vld);
     vector<unsigned char*> CreateShmImages(uint num, bool use_xv);
     void CreatePauseFrame(VOSType subtype);
     void CopyFrame(VideoFrame *to, const VideoFrame *from);

libs/libmythtv/util-opengl.cpp

@@ -67 +67 @@
 {
     int ret, errbase, eventbase, gl_major, gl_minor;
 
+    // this crashes my Unichrome-based system if it is run more than once.
+    static bool has_run = false;
+    static int static_major = 0;
+    static int static_minor = 0;
+    static int static_ret = false;
+
+    if( has_run )
+    {
+        major = static_major;
+        minor = static_minor;
+        return static_ret;
+    }
+
     major = minor = 0;
+    has_run = true;
 
     X11S(ret = glXQueryExtension(XJ_disp, &errbase, &eventbase));
     if (!ret)
@@ -86 +100 @@
     if (!ret)
         return false;
 
-    major = gl_major;
-    minor = gl_minor;
+    static_major = major = gl_major;
+    static_minor = minor = gl_minor;
+    static_ret = true;
 
     return true;
 }

libs/libmythtv/videoout_xv.cpp

@@ -1785 +1785 @@
     if (!xvmc_ctx)
         return false;
 
-    bool createBlocks = !(XVMC_VLD == (xvmc_surf_info.mc_type & XVMC_VLD));
-    xvmc_surfs = CreateXvMCSurfaces(xvmc_buf_attr->GetMaxSurf(), createBlocks);
+    bool surface_has_vld = (XVMC_VLD == (xvmc_surf_info.mc_type & XVMC_VLD));
+    xvmc_surfs = CreateXvMCSurfaces(xvmc_buf_attr->GetMaxSurf(), 
+                                    surface_has_vld);
+
     if (xvmc_surfs.size() < xvmc_buf_attr->GetMinSurf())
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "Unable to create XvMC Surfaces");
@@ -1825 +1827 @@
 #endif // USING_XVMC
 }
 
-vector<void*> VideoOutputXv::CreateXvMCSurfaces(uint num, bool create_xvmc_blocks)
+vector<void*> VideoOutputXv::CreateXvMCSurfaces(uint num, bool surface_has_vld)
 {
     (void)num;
-    (void)create_xvmc_blocks;
+    (void)surface_has_vld;
 
     vector<void*> surfaces;
 #ifdef USING_XVMC
@@ -1837 +1839 @@
                             ((video_dim.height() + 15) / 16));
     uint num_data_blocks = num_mv_blocks * blocks_per_macroblock;
 
+    // need the equivalent of 5 extra surfaces for VLD decoding
+    if( surface_has_vld )
+        num += 5;
+
     // create needed XvMC stuff
     bool ok = true;
     for (uint i = 0; i < num; i++)
@@ -1849 +1855 @@
         int ret = XvMCCreateSurface(XJ_disp, xvmc_ctx, &(surf->surface));
         ok &= (Success == ret);
 
-        if (create_xvmc_blocks && ok)
+        if (ok && !surface_has_vld)
         {
             ret = XvMCCreateBlocks(XJ_disp, xvmc_ctx, num_data_blocks,
                                    &(surf->blocks));
@@ -1860 +1866 @@
             }
         }
 
-        if (create_xvmc_blocks && ok)
+        if (ok && !surface_has_vld)
         {
             ret = XvMCCreateMacroBlocks(XJ_disp, xvmc_ctx, num_mv_blocks,
                                         &(surf->macro_blocks));
@@ -1881 +1887 @@
         }
         surfaces.push_back(surf);
     }
+
+    // for VLD decoding: the last 5 surface were allocated just to make 
+    // sure we had enough space.  now, deallocate/destroy them.
+    
+    if( surface_has_vld )
+    {
+        VERBOSE(VB_PLAYBACK, LOC + QString("VLD - Allocated %1 surfaces, now destroying 5 of them.").arg(surfaces.size()));
+
+        for( uint i = 0; i < 5; i++ )
+        {
+            xvmc_vo_surf_t *surf = (xvmc_vo_surf_t*)surfaces.back();
+            surfaces.pop_back();
+            XvMCDestroySurface(XJ_disp, &(surf->surface));
+            delete surf;
+        }
+    }
 #endif // USING_XVMC
     return surfaces;
 }
@@ -4144 +4166 @@
     SetFromEnv(vld, idct, mc, xv, shm, opengl);
     SetFromHW(XJ_disp, mc, xv, shm, xvmc_opengl, opengl);
 
-    vld  &= mc;
     idct &= mc;
 
     QStringList list;