summaryrefslogtreecommitdiff
path: root/src/video_out/xxmc.h
diff options
context:
space:
mode:
authorThomas Hellström <totte67@users.sourceforge.net>2004-10-12 07:40:07 +0000
committerThomas Hellström <totte67@users.sourceforge.net>2004-10-12 07:40:07 +0000
commit937f0bc598b5b91cc0a8368d6007467d0925d5f6 (patch)
treef695bc88cbbdfc8b0ea98314735b112d28c520fb /src/video_out/xxmc.h
parent77b3e88fe2cf735c457756c8fdbe3f1c78d5ef85 (diff)
downloadxine-lib-937f0bc598b5b91cc0a8368d6007467d0925d5f6.tar.gz
xine-lib-937f0bc598b5b91cc0a8368d6007467d0925d5f6.tar.bz2
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
Diffstat (limited to 'src/video_out/xxmc.h')
-rw-r--r--src/video_out/xxmc.h7
1 files changed, 4 insertions, 3 deletions
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;