Ticket #6514: myth-direct-xv.patch

videoout_xv.cpp

@@ -116 +116 @@
       xvmc_osd_lock(false),
       xvmc_tex(NULL),
 
-      xv_port(-1),      xv_hue_base(0),
+      xv_port(-1),      xv_using_shm(true), xv_hue_base(0),
       xv_colorkey(0),   xv_draw_colorkey(false),
       xv_chroma(0),
 
@@ -2039 +2039 @@
 vector<unsigned char*> VideoOutputXv::CreateShmImages(uint num, bool use_xv)
 {
     VERBOSE(VB_PLAYBACK, LOC +
-            QString("CreateShmImages(%1): video_dim: %2x%3")
-            .arg(num).arg(video_dim.width()).arg(video_dim.height()));
+            QString("CreateShmImages(%1): video_dim: %2x%3 (%4)")
+            .arg(num).arg(video_dim.width()).arg(video_dim.height()).arg(xv_using_shm?"Shared":"Direct"));
 
     vector<unsigned char*> bufs;
     for (uint i = 0; i < num; i++)
     {
-        XShmSegmentInfo *info = new XShmSegmentInfo;
+        XShmSegmentInfo *info = 0;
         void *image = NULL;
         int size = 0;
         int desiredsize = 0;
 
+        if (!use_xv || xv_using_shm)
+            info = new XShmSegmentInfo;
+
         X11L;
 
         if (use_xv)
         {
-            XvImage *img =
-                XvShmCreateImage(XJ_disp, xv_port, xv_chroma, 0,
-                                 video_dim.width(), video_dim.height(), info);
+            XvImage *img;
+            if (xv_using_shm)
+                img = XvShmCreateImage(XJ_disp, xv_port, xv_chroma, 0,
+                                      video_dim.width(), video_dim.height(), info);
+            else
+                img = XvCreateImage   (XJ_disp, xv_port, xv_chroma, 0,
+                                      video_dim.width(), video_dim.height());
             size = img->data_size + 64;
             image = img;
             desiredsize = video_dim.width() * video_dim.height() * 3 / 2;
@@ -2068 +2075 @@
                         "requested size.");
                 XFree(image);
                 image = NULL;
-                delete info;
+                if (info != 0)
+                    delete info;
             }
 
             if (image && (3 == img->num_planes))
             {
-                XJ_shm_infos.push_back(info);
+                if (xv_using_shm)
+                    XJ_shm_infos.push_back(info);
                 YUVInfo tmp(img->width, img->height, img->data_size,
                             img->pitches, img->offsets);
                 if (xv_chroma == GUID_YV12_PLANAR)
@@ -2091 +2100 @@
                         "with the correct number of pixel planes.");
                 XFree(image);
                 image = NULL;
-                delete info;
+                if (info != 0)
+                    delete info;
             }
         }
         else
@@ -2128 +2138 @@
 
         if (image)
         {
-            XJ_shm_infos[i]->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0777);
-            if (XJ_shm_infos[i]->shmid >= 0)
+            if (info != 0)
             {
-                XJ_shm_infos[i]->shmaddr = (char*)
-                    shmat(XJ_shm_infos[i]->shmid, 0, 0);
-                if (use_xv)
-                    ((XvImage*)image)->data = XJ_shm_infos[i]->shmaddr;
-                else
-                    ((XImage*)image)->data = XJ_shm_infos[i]->shmaddr;
-                xv_buffers[(unsigned char*) XJ_shm_infos[i]->shmaddr] = image;
-                XJ_shm_infos[i]->readOnly = False;
+                XJ_shm_infos[i]->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0777);
+                if (XJ_shm_infos[i]->shmid >= 0)
+                {
+                    XJ_shm_infos[i]->shmaddr = (char*)
+                        shmat(XJ_shm_infos[i]->shmid, 0, 0);
+                    if (use_xv)
+                        ((XvImage*)image)->data = XJ_shm_infos[i]->shmaddr;
+                    else
+                        ((XImage*)image)->data = XJ_shm_infos[i]->shmaddr;
+                    xv_buffers[(unsigned char*) XJ_shm_infos[i]->shmaddr] = image;
+                    XJ_shm_infos[i]->readOnly = False;
 
-                X11L;
-                XShmAttach(XJ_disp, XJ_shm_infos[i]);
-                XSync(XJ_disp, False); // needed for FreeBSD?
-                X11U;
+                    X11L;
+                    XShmAttach(XJ_disp, XJ_shm_infos[i]);
+                    XSync(XJ_disp, False); // needed for FreeBSD?
+                    X11U;
 
-                // Mark for delete immediately.
-                // It won't actually be removed until after we detach it.
-                shmctl(XJ_shm_infos[i]->shmid, IPC_RMID, 0);
+                    // Mark for delete immediately.
+                    // It won't actually be removed until after we detach it.
+                    shmctl(XJ_shm_infos[i]->shmid, IPC_RMID, 0);
 
-                bufs.push_back((unsigned char*) XJ_shm_infos[i]->shmaddr);
+                    bufs.push_back((unsigned char*) XJ_shm_infos[i]->shmaddr);
+                }
+                else
+                {
+                    VERBOSE(VB_IMPORTANT, LOC_ERR +
+                            "CreateXvShmImages(): shmget() failed." + ENO);
+                    break;
+                }
             }
             else
             {
-                VERBOSE(VB_IMPORTANT, LOC_ERR +
-                        "CreateXvShmImages(): shmget() failed." + ENO);
-                break;
+                char* mbfr = (char*)malloc( ((XvImage*)image)->data_size );
+                if (mbfr != 0)
+                {
+                    ((XvImage*)image)->data = mbfr;
+                    bufs.push_back((unsigned char*)mbfr);
+                    xv_buffers[(unsigned char*)mbfr] = image;
+                }
+                else
+                {
+                    VERBOSE(VB_IMPORTANT, LOC_ERR +
+                            "CreateXvShmImages(): malloc failed.");
+                    break;
+                }
             }
         }
         else
@@ -2176 +2205 @@
         ok = CreateXvMCBuffers();
     else if (subtype == XVideo && xv_port >= 0)
     {
-        vector<unsigned char*> bufs =
-            CreateShmImages(vbuffers.allocSize(), true);
-
-        ok = (bufs.size() >= vbuffers.allocSize()) &&
-            vbuffers.CreateBuffers(video_dim.width(), video_dim.height(),
+        vector<unsigned char*> bufs;
+        xv_using_shm = true;
+        bufs = CreateShmImages(vbuffers.allocSize(), true);
+        vector<XErrorEvent> errs = UninstallXErrorHandler(XJ_disp);
+        InstallXErrorHandler(XJ_disp);
+        if (bufs.size() < vbuffers.allocSize() || errs.size())
+        {
+            VERBOSE(VB_IMPORTANT, LOC + "Switch to Xv without Xshm");
+            DeleteBuffers(XVideo,true);
+            UninstallXErrorHandler(XJ_disp);
+            InstallXErrorHandler(XJ_disp);
+            xv_using_shm = false;
+            bufs = CreateShmImages(vbuffers.allocSize(), true);
+        }
+        if (bufs.size() >= vbuffers.allocSize())
+            ok = vbuffers.CreateBuffers(video_dim.width(), video_dim.height(),
                                    bufs, XJ_yuv_infos);
-
+        else
+            ok = false;
         X11S(XSync(XJ_disp, False));
     }
     else if (subtype == XShm || subtype == Xlib)
@@ -2199 +2240 @@
 
             X11L;
 
-            int bytes_per_line = XJ_depth / 8 * display_visible_rect.width();
+            int bytes_per_line;
             int scrn = DefaultScreen(XJ_disp);
             Visual *visual = DefaultVisual(XJ_disp, scrn);
             XJ_non_xv_image = XCreateImage(XJ_disp, visual, XJ_depth,
                                            ZPixmap, /*offset*/0, /*data*/0,
                                            display_visible_rect.width(),
                                            display_visible_rect.height(),
-                                           /*bitmap_pad*/0,
-                                           bytes_per_line);
+                                           /*bitmap_pad*/8,0);
 
             X11U;
 
@@ -2218 +2258 @@
                         <<"                        "
                         <<"XJ_depth("<<XJ_depth<<") "
                         <<"WxH("<<display_visible_rect.width()
-                        <<"x"<<display_visible_rect.height()<<") "
-                        <<"bpl("<<bytes_per_line<<")");
+                        <<"x"<<display_visible_rect.height()<<")");
                 return false;
             }
+            bytes_per_line = XJ_non_xv_image->bytes_per_line;
             XJ_non_xv_image->data = (char*) malloc(
                 bytes_per_line * display_visible_rect.height());
         }
@@ -2253 +2293 @@
 
     if (ok)
         CreatePauseFrame(subtype);
-
     return ok;
 }
 
@@ -3030 +3069 @@
         vbuffers.LockFrame(frame, "ShowXVideo");
         int video_height = (3 != field) ?
             (video_rect.height()/2) : video_rect.height();
-        X11S(XvShmPutImage(XJ_disp, xv_port, XJ_curwin,
-                           XJ_gc, image,
-                           video_rect.left(), src_y,
-                           video_rect.width(), video_height,
-                           display_video_rect.left(), dest_y,
-                           display_video_rect.width(),
-                           display_video_rect.height(), False));
+        if (xv_using_shm)
+        {
+            X11S(XvShmPutImage(XJ_disp, xv_port, XJ_curwin,
+                               XJ_gc, image,
+                               video_rect.left(), src_y,
+                               video_rect.width(), video_height,
+                               display_video_rect.left(), dest_y,
+                               display_video_rect.width(),
+                               display_video_rect.height(), False));
+        }
+        else
+        {
+            X11S(XvPutImage   (XJ_disp, xv_port, XJ_curwin,
+                               XJ_gc, image,
+                               video_rect.left(), src_y,
+                               video_rect.width(), video_height,
+                               display_video_rect.left(), dest_y,
+                               display_video_rect.width(),
+                               display_video_rect.height() ));
+        }
         vbuffers.UnlockFrame(frame, "ShowXVideo");
     }
 }

videoout_xv.h

@@ -253 +253 @@
 
     // Basic Xv drawing info
     int                  xv_port;
+    bool                 xv_using_shm;
     int                  xv_hue_base;
     int                  xv_colorkey;
     bool                 xv_draw_colorkey;