[MPlayer-dev-eng] vo_gl PBO patch ..

[Reimar Döffinger]

On Tue, May 06, 2008 at 08:53:21AM +0200, Reimar Döffinger wrote:
> On Tue, May 06, 2008 at 04:44:30AM +0400, Vladimir Mosgalin wrote:
> > I've found a strange video which produces very distorted picture with
> > -vo gl:yuv=2:force-pbo. -vo gl, gl:yuv=<anything> and gl:force-pbo work
> > fine, but combination of yuv and force-pbo options produces strange
> > result. Adding -noslices changes distortion a bit, but doesn't solve it.
> 
> Oh, sorry, you are using a buggy version anyway.
> Try attached patch, I don't know if it will help though.
> Also note that in latest SVN -vo gl supports -dr for B-frames (in
> MPEG2/4), which might help quite a bit if you have videos in that
> format.

Sorry, that patch was broken. Attached patch works. I could not
reproduce your problems with this version, and the first version
crashed for me for quite a lot of files, but I had no corruption.
So no idea if it fixes everything...

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libvo/vo_gl.c
===================================================================
--- libvo/vo_gl.c	(revision 26675)
+++ libvo/vo_gl.c	(working copy)
@@ -16,6 +16,7 @@
 #ifdef HAVE_NEW_GUI
 #include "gui/interface.h"
 #endif
+#include "fastmemcpy.h"
 #include "libass/ass.h"
 #include "libass/ass_mp.h"
 
@@ -81,6 +82,7 @@
 static uint32_t image_format;
 static int many_fmts;
 static int use_glFinish;
+static int force_pbo;
 static int swap_interval;
 static GLenum gl_target;
 static GLint gl_texfmt;
@@ -704,10 +706,24 @@
 
 static uint32_t draw_image(mp_image_t *mpi) {
   int slice = slice_height;
-  int stride[3] = {mpi->stride[0], mpi->stride[1], mpi->stride[2]};
-  unsigned char *planes[3] = {mpi->planes[0], mpi->planes[1], mpi->planes[2]};
+  int stride[3];
+  unsigned char *planes[3];
+  mp_image_t mpi2 = *mpi;
   if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
     return VO_TRUE;
+  mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP;
+  mpi2.width = mpi2.w; mpi2.height = mpi2.h;
+  if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) {
+    int bpp = mpi->imgfmt == IMGFMT_YV12 ? 1 : mpi->bpp;
+    memcpy_pic(mpi2.planes[0], mpi->planes[0], mpi->w * bpp, mpi->h, mpi2.stride[0], mpi->stride[0]);
+    if (mpi->imgfmt == IMGFMT_YV12) {
+      memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]);
+      memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]);
+    }
+    mpi = &mpi2;
+  }
+  stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2];
+  planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2];
   mpi_flipped = (stride[0] < 0);
   if (mpi->flags & MP_IMGFLAG_DIRECT) {
     intptr_t base = (intptr_t)planes[0];
@@ -790,6 +806,7 @@
   {"lscale",       OPT_ARG_INT,  &lscale,       (opt_test_f)int_non_neg},
   {"cscale",       OPT_ARG_INT,  &cscale,       (opt_test_f)int_non_neg},
   {"glfinish",     OPT_ARG_BOOL, &use_glFinish, NULL},
+  {"force-pbo",    OPT_ARG_BOOL, &force_pbo,    NULL},
   {"swapinterval", OPT_ARG_INT,  &swap_interval,NULL},
   {"customprog",   OPT_ARG_MSTRZ,&custom_prog,  NULL},
   {"customtex",    OPT_ARG_MSTRZ,&custom_tex,   NULL},
@@ -811,6 +828,7 @@
     cscale = 0;
     use_rectangle = 0;
     use_glFinish = 0;
+    force_pbo = 0;
     swap_interval = 1;
     slice_height = 0;
     custom_prog = NULL;
@@ -835,6 +853,8 @@
               "    0: use power-of-two textures\n"
               "    1: use texture_rectangle\n"
               "    2: use texture_non_power_of_two\n"
+              "  force-pbo\n"
+              "    Force use of PBO even if this involves an extra memcpy\n"
               "  glfinish\n"
               "    Call glFinish() before swapping buffers\n"
               "  swapinterval=<n>\n"