From 937f0bc598b5b91cc0a8368d6007467d0925d5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Date: Tue, 12 Oct 2004 07:40:07 +0000 Subject: xxmc driver updates: Updated software fallback mechanism to be compatible with post plugin deinterlacing. A decoder using the plugin can now request a software fallback format to be used if acceleration fails. Removed the software deinterlacer that was inherited from the xv plugin. Made idct/mocomp fall back to software decoding for interlaced streams, since these are not rendered correctly either with the xvmc or the xxmc plugin. CVS patchset: 7029 CVS date: 2004/10/12 07:40:07 --- src/video_out/xxmc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/video_out/xxmc.h') diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 74825add4..568cc761e 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xxmc.h,v 1.2 2004/10/03 12:36:15 totte67 Exp $ + * $Id: xxmc.h,v 1.3 2004/10/12 07:40:23 totte67 Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -136,6 +136,7 @@ typedef struct { XvMCSurface *xvmc_surf; xine_xxmc_t xxmc_data; + int last_sw_format; } xxmc_frame_t; typedef struct{ @@ -208,8 +209,6 @@ struct xxmc_driver_s { /* all scaling information goes here */ vo_scale_t sc; - xxmc_frame_t deinterlace_frame; - int deinterlace_method; int deinterlace_enabled; int use_colorkey; uint32_t colorkey; @@ -244,6 +243,8 @@ struct xxmc_driver_s { xvmc_surface_handler_t xvmc_surf_handler; unsigned xvmc_mpeg; unsigned xvmc_accel; + unsigned last_accel_request; + unsigned fallback_used; unsigned xvmc_width; unsigned xvmc_height; int have_xvmc_autopaint; -- cgit v1.2.3