[MPlayer-cvslog] r28581 - in trunk: libmpcodecs/vf_vo.c libvo/vo_xvmc.c

[reimar]

Author: reimar
Date: Sun Feb 15 09:07:36 2009
New Revision: 28581

Log:
Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
be duplicated for other systems like VDPAU or VAAPI.

Modified:
   trunk/libmpcodecs/vf_vo.c
   trunk/libvo/vo_xvmc.c

Modified: trunk/libmpcodecs/vf_vo.c
==============================================================================
--- trunk/libmpcodecs/vf_vo.c	Sun Feb 15 08:54:25 2009	(r28580)
+++ trunk/libmpcodecs/vf_vo.c	Sun Feb 15 09:07:36 2009	(r28581)
@@ -165,7 +165,10 @@ static int query_format(struct vf_instan
 
 static void get_image(struct vf_instance_s* vf,
         mp_image_t *mpi){
-    if(vo_directrendering && vo_config_count)
+    if(!vo_config_count) return;
+    // GET_IMAGE is required for hardware-accelerated formats
+    if(vo_directrendering ||
+       IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt))
 	video_out->control(VOCTRL_GET_IMAGE,mpi);
 }
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Sun Feb 15 08:54:25 2009	(r28580)
+++ trunk/libvo/vo_xvmc.c	Sun Feb 15 09:07:36 2009	(r28581)
@@ -683,7 +683,6 @@ skip_surface_allocation:
    free_element = 0;
    first_frame = 1;
 
-   vo_directrendering = 1;//ugly hack, coz xvmc works only with direct rendering
    image_format=format;
    return 0;		
 }