annotate libvo/vo_dfbmga.c @ 10663:711159267b2d

clean up field flags: 1) cosmetic change, no reason these need to be mpeg2-specific 2) add a flag to tell when fields are ordered, so we don't have to assume bff (which would usually be wrong) when field flags are not available. 3) add other flags for future use :)
author rfelker
date Mon, 18 Aug 2003 14:49:06 +0000
parents a4ea0311ade2
children 59e7beccdee0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1 /*
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
2 MPlayer video driver for DirectFB / Matrox G400/G450/G550
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
3
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
4 Copyright (C) 2002,2003 Ville Syrjala <syrjala@sci.fi>
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
5
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
6 Originally based on vo_directfb.c by
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
7 Jiri Svoboda <Jiri.Svoboda@seznam.cz>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
8
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
9 This library is free software; you can redistribute it and/or
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
10 modify it under the terms of the GNU Lesser General Public
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
11 License as published by the Free Software Foundation; either
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
12 version 2 of the License, or (at your option) any later version.
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
13
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
14 This library is distributed in the hope that it will be useful,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
17 Lesser General Public License for more details.
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
18
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
19 You should have received a copy of the GNU Lesser General Public
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
20 License along with this library; if not, write to the
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
21 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
22 Boston, MA 02111-1307, USA.
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
23 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
24
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
25 /* directfb includes */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
26 #include <directfb.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
27
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
28 /* other things */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
29 #include <stdio.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
30 #include <stdlib.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
31 #include <string.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
32
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
33 #include "config.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
34 #include "video_out.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
35 #include "video_out_internal.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
36 #include "fastmemcpy.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
37 #include "sub.h"
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
38 #include "mp_msg.h"
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
39 #include "aspect.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
40
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8138
diff changeset
41 static vo_info_t info = {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
42 "DirectFB / Matrox G400/G450/G550",
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
43 "dfbmga",
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
44 "Ville Syrjala <syrjala@sci.fi>",
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
45 ""
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
46 };
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
47
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8138
diff changeset
48 LIBVO_EXTERN(dfbmga)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8138
diff changeset
49
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
50 extern int verbose;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
51
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
52 /******************************
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
53 * directfb *
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
54 ******************************/
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
55
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
56 /*
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
57 * (Globals)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
58 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
59 static IDirectFB *dfb;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
60
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
61 static IDirectFBDisplayLayer *bes;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
62 static IDirectFBDisplayLayer *crtc2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
63 static IDirectFBDisplayLayer *spic;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
64
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
65 static int num_bufs;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
66 static int current_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
67 static int current_ip_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
68 static IDirectFBSurface *bufs[3];
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
69
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
70 static IDirectFBSurface *frame;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
71 static IDirectFBSurface *besframe;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
72 static IDirectFBSurface *c2frame;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
73 static IDirectFBSurface *subframe;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
74
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
75 static DFBSurfacePixelFormat frame_format;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
76 static DFBSurfacePixelFormat subframe_format;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
77
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
78 static DFBRectangle drect;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
79
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
80 static IDirectFBInputDevice *keyboard;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
81 static IDirectFBEventBuffer *buffer;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
82
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
83 static int inited = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
84
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
85 static int blit_done;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
86 static int stretch;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
87
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
88 static int use_bes;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
89 static int use_crtc2;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
90 static int use_spic;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
91 static int use_input;
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
92 static int field_parity;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
93 static int flipping;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
94 static DFBDisplayLayerBufferMode buffermode;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
95
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
96 static int osd_changed;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
97 static int osd_dirty;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
98 static int osd_current;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
99 static int osd_max;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
100
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
101 /******************************
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
102 * vo_dfbmga *
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
103 ******************************/
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
104
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
105 #if DIRECTFBVERSION < 918
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
106 #define DSPF_ALUT44 DSPF_LUT8
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
107 #define DLBM_TRIPLE ~0
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
108 #define DSFLIP_ONSYNC 0
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
109 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
110
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
111 #if DIRECTFBVERSION < 916
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
112 #define DSPF_ARGB1555 DSPF_RGB15
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
113 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
114
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
115 /* command line/config file options */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
116 #ifdef HAVE_FBDEV
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
117 extern char *fb_dev_name;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
118 #else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
119 char *fb_dev_name;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
120 #endif
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
121
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
122 static uint32_t in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
123 static uint32_t in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
124 static uint32_t screen_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
125 static uint32_t screen_height;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
126 static uint32_t sub_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
127 static uint32_t sub_height;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
128
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
129 static char *
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
130 pixelformat_name( DFBSurfacePixelFormat format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
131 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
132 switch(format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
133 case DSPF_ARGB:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
134 return "ARGB";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
135 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
136 return "RGB32";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
137 case DSPF_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
138 return "RGB24";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
139 case DSPF_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
140 return "RGB16";
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
141 case DSPF_ARGB1555:
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
142 return "ARGB1555";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
143 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
144 return "YUY2";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
145 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
146 return "UYVY";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
147 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
148 return "YV12";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
149 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
150 return "I420";
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
151 case DSPF_ALUT44:
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
152 return "ALUT44";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
153 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
154 return "Unknown pixel format";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
155 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
156 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
157
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
158 static DFBSurfacePixelFormat
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
159 imgfmt_to_pixelformat( uint32_t format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
160 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
161 switch (format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
162 case IMGFMT_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
163 case IMGFMT_BGR32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
164 return DSPF_ARGB;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
165 case IMGFMT_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
166 case IMGFMT_BGR24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
167 return DSPF_RGB24;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
168 case IMGFMT_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
169 case IMGFMT_BGR16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
170 return DSPF_RGB16;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
171 case IMGFMT_RGB15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
172 case IMGFMT_BGR15:
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
173 return DSPF_ARGB1555;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
174 case IMGFMT_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
175 return DSPF_YUY2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
176 case IMGFMT_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
177 return DSPF_UYVY;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
178 case IMGFMT_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
179 return DSPF_YV12;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
180 case IMGFMT_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
181 case IMGFMT_IYUV:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
182 return DSPF_I420;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
183 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
184 return DSPF_UNKNOWN;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
185 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
186 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
187
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
188 struct layer_enum
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
189 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
190 const char *name;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
191 IDirectFBDisplayLayer **layer;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
192 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
193 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
194
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
195 static DFBEnumerationResult
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
196 get_layer_by_name( DFBDisplayLayerID id,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
197 DFBDisplayLayerDescription desc,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
198 void *data )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
199 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
200 struct layer_enum *l = (struct layer_enum *) data;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
201
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
202 #if DIRECTFBVERSION > 915
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
203 /* We have desc.name so use it */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
204 if (!strcmp( l->name, desc.name ))
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
205 if ((l->res = dfb->GetDisplayLayer( dfb, id, l->layer )) == DFB_OK)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
206 return DFENUM_CANCEL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
207 #else
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
208 /* Fake it according to id */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
209 if ((id == 1 && !strcmp( l->name, "Matrox Backend Scaler" )) ||
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
210 (id == 2 && !strcmp( l->name, "Matrox CRTC2" )) ||
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
211 (id == 3 && !strcmp( l->name, "Matrox CRTC2 Sub-Picture" )))
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
212 if ((l->res = dfb->GetDisplayLayer( dfb, id, l->layer )) == DFB_OK)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
213 return DFENUM_CANCEL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
214 #endif
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
215
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
216 return DFENUM_OK;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
217 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
218
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
219 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
220 preinit( const char *arg )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
221 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
222 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
223
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
224 bes = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
225 crtc2 = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
226 keyboard = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
227 buffer = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
228
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
229 /* Some defaults */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
230 use_bes = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
231 use_crtc2 = 1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
232 use_spic = 1;
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
233 field_parity = -1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
234 #if DIRECTFBVERSION > 917
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
235 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
236 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
237 #else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
238 buffermode = DLBM_BACKVIDEO;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
239 osd_max = 2;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
240 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
241 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
242
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
243 use_input = !getenv( "DISPLAY" );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
244
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
245 if (vo_subdevice) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
246 int show_help = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
247 int opt_no = 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
248 while (*vo_subdevice != '\0') {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
249 if (!strncmp(vo_subdevice, "bes", 3)) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
250 use_bes = !opt_no;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
251 vo_subdevice += 3;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
252 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
253 } else if (!strncmp(vo_subdevice, "crtc2", 5)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
254 use_crtc2 = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
255 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
256 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
257 } else if (!strncmp(vo_subdevice, "spic", 4)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
258 use_spic = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
259 vo_subdevice += 4;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
260 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
261 } else if (!strncmp(vo_subdevice, "input", 5)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
262 use_input = !opt_no;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
263 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
264 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
265 } else if (!strncmp(vo_subdevice, "buffermode=", 11)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
266 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
267 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
268 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
269 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
270 vo_subdevice += 11;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
271 if (!strncmp(vo_subdevice, "single", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
272 buffermode = DLBM_FRONTONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
273 osd_max = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
274 flipping = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
275 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
276 } else if (!strncmp(vo_subdevice, "double", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
277 buffermode = DLBM_BACKVIDEO;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
278 osd_max = 2;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
279 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
280 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
281 } else if (!strncmp(vo_subdevice, "triple", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
282 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
283 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
284 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
285 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
286 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
287 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
288 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
289 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
290 opt_no = 0;
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
291 } else if (!strncmp(vo_subdevice, "fieldparity=", 12)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
292 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
293 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
294 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
295 }
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
296 vo_subdevice += 12;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
297 if (!strncmp(vo_subdevice, "top", 3)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
298 field_parity = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
299 vo_subdevice += 3;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
300 } else if (!strncmp(vo_subdevice, "bottom", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
301 field_parity = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
302 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
303 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
304 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
305 break;
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
306 }
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
307 opt_no = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
308 } else if (!strncmp(vo_subdevice, "no", 2)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
309 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
310 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
311 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
312 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
313 vo_subdevice += 2;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
314 opt_no = 1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
315 } else if (*vo_subdevice == ':') {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
316 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
317 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
318 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
319 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
320 vo_subdevice++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
321 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
322 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
323 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
324 break;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
325 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
326 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
327 if (show_help) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
328 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
329 "\nvo_dfbmga command line help:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
330 "Example: mplayer -vo dfbmga:nocrtc2:bes:buffermode=single\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
331 "\nOptions (use 'no' prefix to disable):\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
332 " bes Use Backend Scaler\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
333 " crtc2 Use CRTC2\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
334 " spic Use hardware sub-picture for OSD\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
335 " input Use DirectFB for keyboard input\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
336 "\nOther options:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
337 " buffermode=(single|double|triple)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
338 " single Use single buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
339 " double Use double buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
340 " triple Use triple buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
341 " fieldparity=(top|bottom)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
342 " top Top field first\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
343 " bottom Bottom field first\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
344 "\n" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
345 return -1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
346 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
347 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
348 if (!use_bes && !use_crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
349 mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: No output selected\n" );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
350 return -1;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
351 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
352
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
353 if (!inited) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
354 if ((res = DirectFBInit( NULL, NULL )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
355 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
356 "vo_dfbmga: DirectFBInit() failed - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
357 DirectFBErrorString( res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
358 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
359 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
360
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
361 if (!fb_dev_name && !(fb_dev_name = getenv( "FRAMEBUFFER" )))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
362 fb_dev_name = "/dev/fb0";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
363 DirectFBSetOption( "fbdev", fb_dev_name );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
364 DirectFBSetOption( "no-cursor", "" );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
365 DirectFBSetOption( "bg-color", "00000000" );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
366
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
367 if ((res = DirectFBCreate( &dfb )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
368 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
369 "vo_dfbmga: DirectFBCreate() failed - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
370 DirectFBErrorString( res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
371 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
372 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
373
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
374 inited = 1;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
375 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
376
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
377 if (use_bes) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
378 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
379 "Matrox Backend Scaler",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
380 &bes,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
381 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
382 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
383
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
384 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
385 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
386 mp_msg( MSGT_VO, MSGL_ERR, "Can't get BES layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
387 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
388 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
389 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
390 if ((res = bes->SetCooperativeLevel( bes, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
391 mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to BES - %s\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
392 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
393 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
394 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
395 bes->SetOpacity( bes, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
396 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
397
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
398 if (use_crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
399 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
400 "Matrox CRTC2",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
401 &crtc2,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
402 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
403 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
404
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
405 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
406 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
407 mp_msg( MSGT_VO, MSGL_ERR, "Can't get CRTC2 layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
408 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
409 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
410 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
411 if ((res = crtc2->SetCooperativeLevel( crtc2, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
412 mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to CRTC2 - %s\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
413 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
414 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
415 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
416 crtc2->SetOpacity( crtc2, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
417 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
418
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
419 if (use_input) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
420 if ((res = dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
421 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
422 "vo_dfbmga: Can't get keyboard - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
423 DirectFBErrorString( res ) );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
424 return -1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
425 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
426 keyboard->CreateEventBuffer( keyboard, &buffer );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
427 buffer->Reset( buffer );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
428 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
429
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
430 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
431 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
432
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
433 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
434 config( uint32_t width, uint32_t height,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
435 uint32_t d_width, uint32_t d_height,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
436 uint32_t fullscreen,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
437 char *title,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
438 uint32_t format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
439 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
440 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
441
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
442 DFBDisplayLayerConfig dlc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
443 DFBDisplayLayerConfigFlags failed;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
444
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
445 uint32_t out_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
446 uint32_t out_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
447
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
448 besframe = NULL;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
449 c2frame = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
450 spic = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
451 subframe = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
452 bufs[0] = bufs[1] = bufs[2] = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
453
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
454 in_width = width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
455 in_height = height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
456
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
457 aspect_save_orig(width, height);
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
458 aspect_save_prescale(d_width, d_height);
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
459
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
460 dlc.pixelformat = imgfmt_to_pixelformat( format );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
461
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
462 {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
463 /* Draw to a temporary surface */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
464 DFBSurfaceDescription dsc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
465
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
466 dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT |
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
467 DSDESC_PIXELFORMAT;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
468 dsc.width = in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
469 dsc.height = in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
470 dsc.pixelformat = dlc.pixelformat;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
471
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
472 /* Don't waste video memory since we don't need direct stretchblit */
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
473 if (use_bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
474 dsc.flags |= DSDESC_CAPS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
475 dsc.caps = DSCAPS_SYSTEMONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
476 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
477
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
478 for (num_bufs = 0; num_bufs < 3; num_bufs++) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
479 if ((res = dfb->CreateSurface( dfb, &dsc, &bufs[num_bufs] )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
480 if (num_bufs == 0) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
481 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
482 "vo_dfbmga: Can't create surfaces - %s!\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
483 DirectFBErrorString( res ) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
484 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
485 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
486 break;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
487 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
488 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
489 frame = bufs[0];
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
490 current_buf = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
491 current_ip_buf = 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
492 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
493 frame->GetPixelFormat( frame, &frame_format );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
494 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Video surface %dx%d %s\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
495 in_width, in_height,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
496 pixelformat_name( frame_format ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
497
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
498
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
499 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
500 * BES
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
501 */
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
502 if (use_bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
503 dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
504 dlc.width = in_width;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
505 dlc.height = in_height;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
506
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
507 if (use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
508 dlc.buffermode = DLBM_FRONTONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
509 else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
510 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
511
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
512 if ((res = bes->TestConfiguration( bes, &dlc, &failed )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
513 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
514 "vo_dfbmga: Invalid BES configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
515 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
516 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
517 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
518 if ((res = bes->SetConfiguration( bes, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
519 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
520 "vo_dfbmga: BES configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
521 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
522 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
523 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
524 bes->GetSurface( bes, &besframe );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
525 besframe->SetBlittingFlags( besframe, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
526
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
527 aspect_save_screenres( 10000, 10000 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
528 aspect( &out_width, &out_height, A_ZOOM );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
529 bes->SetScreenLocation( bes,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
530 (1.0f - (float) out_width / 10000.0f) / 2.0f,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
531 (1.0f - (float) out_height / 10000.0f) / 2.0f,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
532 (float) out_width / 10000.0f,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
533 (float) out_height / 10000.0f );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
534
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
535 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
536 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
537 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
538 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
539 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
540
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
541 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: BES using %s buffering\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
542 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
543 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
544 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: BES surface %dx%d %s\n", dlc.width, dlc.height, pixelformat_name( dlc.pixelformat ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
545 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
546
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
547 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
548 * CRTC2
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
549 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
550 if (use_crtc2) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
551 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE | DLCONF_OPTIONS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
552 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
553 dlc.options = DLOP_FLICKER_FILTERING;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
554
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
555 #if DIRECTFBVERSION > 916
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
556 if (field_parity != -1) {
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
557 dlc.options = DLOP_FIELD_PARITY;
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
558 }
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
559 #endif
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
560
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
561 switch (dlc.pixelformat) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
562 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
563 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
564 /* sub-picture supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
565 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
566
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
567 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
568 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
569 /* Blit to YUY2/UYVY not supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
570 dlc.pixelformat = DSPF_ARGB;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
571
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
572 /* fall through */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
573 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
574 /* sub-picture not supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
575 use_spic = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
576 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
577
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
578 if ((res = crtc2->TestConfiguration( crtc2, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
579 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
580 "vo_dfbmga: Invalid CRTC2 configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
581 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
582 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
583 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
584 if ((res = crtc2->SetConfiguration( crtc2, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
585 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
586 "vo_dfbmga: CRTC2 configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
587 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
588 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
589 }
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
590
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
591 #if DIRECTFBVERSION > 916
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
592 if (field_parity != -1)
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
593 crtc2->SetFieldParity( crtc2, field_parity );
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
594 #endif
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
595
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
596 crtc2->GetSurface( crtc2, &c2frame );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
597 c2frame->SetBlittingFlags( c2frame, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
598 c2frame->SetColor( c2frame, 0, 0, 0, 0xff );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
599
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
600 c2frame->GetSize( c2frame, &screen_width, &screen_height );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
601
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
602 /* Don't stretch only slightly smaller videos */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
603 if ((in_width > (0.95 * screen_width)) &&
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
604 (in_width < screen_width))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
605 out_width = in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
606 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
607 out_width = screen_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
608 if ((in_height > (0.95 * screen_height)) &&
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
609 (in_height < screen_height))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
610 out_height = in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
611 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
612 out_height = screen_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
613
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
614 aspect_save_screenres( out_width, out_height );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
615 aspect( &out_width, &out_height, (fullscreen & 0x01) ? A_ZOOM : A_NOZOOM );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
616
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
617 if (in_width != out_width ||
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
618 in_height != out_height)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
619 stretch = 1;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
620 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
621 stretch = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
622
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
623 drect.x = (screen_width - out_width) / 2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
624 drect.y = (screen_height - out_height) / 2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
625 drect.w = out_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
626 drect.h = out_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
627
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
628 c2frame->Clear( c2frame, 0, 0, 0, 0xff );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
629 c2frame->Flip( c2frame, NULL, 0 );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
630 c2frame->Clear( c2frame, 0, 0, 0, 0xff );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
631 c2frame->Flip( c2frame, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
632 c2frame->Clear( c2frame, 0, 0, 0, 0xff );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
633
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
634 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: CRTC2 using %s buffering\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
635 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
636 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
637 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: CRTC2 surface %dx%d %s\n", dlc.width, dlc.height, pixelformat_name( dlc.pixelformat ) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
638 } else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
639 use_spic = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
640 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
641
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
642 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
643 * Sub-picture
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
644 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
645 if (use_spic) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
646 /* Draw OSD to sub-picture surface */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
647 IDirectFBPalette *palette;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
648 DFBColor color;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
649 int i;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
650 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
651 "Matrox CRTC2 Sub-Picture",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
652 &spic,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
653 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
654 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
655 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
656 if (l.res != DFB_OK) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
657 mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Can't get sub-picture layer - %s\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
658 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
659 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
660 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
661 if ((res = spic->SetCooperativeLevel( spic, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
662 mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to sub-picture - %s\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
663 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
664 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
665 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
666 spic->SetOpacity( spic, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
667
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
668 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
669 dlc.pixelformat = DSPF_ALUT44;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
670 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
671
9461
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
672 #if DIRECTFBVERSION > 916
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
673 dlc.flags |= DLCONF_OPTIONS;
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
674 dlc.options = DLOP_ALPHACHANNEL;
17cf28e5846a Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi>
alex
parents: 9380
diff changeset
675 #endif
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
676 if ((res = spic->TestConfiguration( spic, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
677 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
678 "vo_dfbmga: Invalid sub-picture configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
679 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
680 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
681 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
682 if ((res = spic->SetConfiguration( spic, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
683 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
684 "vo_dfbmga: Sub-picture configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
685 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
686 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
687 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
688
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
689 spic->GetSurface( spic, &subframe );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
690
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
691 subframe->GetPalette( subframe, &palette );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
692 color.a = 0xff;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
693 for (i = 0; i < 16; i++) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
694 color.r = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
695 color.g = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
696 color.b = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
697 palette->SetEntries( palette, &color, 1, i );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
698 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
699 palette->Release( palette );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
700
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
701 subframe->Clear( subframe, 0, 0, 0, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
702 subframe->Flip( subframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
703 subframe->Clear( subframe, 0, 0, 0, 0 );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
704 subframe->Flip( subframe, NULL, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
705 subframe->Clear( subframe, 0, 0, 0, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
706
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
707 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Sub-picture layer using %s buffering\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
708 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
709 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
710 } else if (use_crtc2) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
711 /* Draw OSD to CRTC2 surface */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
712 subframe = c2frame;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
713 } else {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
714 /* Draw OSD to BES surface */
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
715 subframe = besframe;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
716 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
717
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
718 subframe->GetSize( subframe, &sub_width, &sub_height );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
719 subframe->GetPixelFormat( subframe, &subframe_format );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
720 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Sub-picture surface %dx%d %s (%s)\n",
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
721 sub_width, sub_height,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
722 pixelformat_name( subframe_format ),
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
723 use_crtc2 ? (use_spic ? "Sub-picture layer" : "CRTC2") : "BES" );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
724
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
725 /* Display all needed layers */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
726 if (use_bes)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
727 bes->SetOpacity( bes, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
728 if (use_crtc2)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
729 crtc2->SetOpacity( crtc2, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
730 if (use_spic)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
731 spic->SetOpacity( spic, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
732
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
733 osd_dirty = 0;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
734 osd_current = 1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
735 blit_done = 0;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
736
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
737 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
738 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
739
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
740 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
741 query_format( uint32_t format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
742 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
743 switch (format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
744 case IMGFMT_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
745 case IMGFMT_BGR32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
746 case IMGFMT_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
747 case IMGFMT_BGR24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
748 case IMGFMT_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
749 case IMGFMT_BGR16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
750 case IMGFMT_RGB15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
751 case IMGFMT_BGR15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
752 case IMGFMT_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
753 case IMGFMT_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
754 case IMGFMT_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
755 case IMGFMT_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
756 case IMGFMT_IYUV:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
757 return (VFCAP_HWSCALE_UP |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
758 VFCAP_HWSCALE_DOWN |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
759 VFCAP_CSP_SUPPORTED_BY_HW |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
760 VFCAP_CSP_SUPPORTED |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
761 VFCAP_OSD);
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
762 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
763
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
764 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
765 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
766
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
767 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
768 vo_draw_alpha_alut44( int w, int h,
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
769 unsigned char* src,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
770 unsigned char *srca,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
771 int srcstride,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
772 unsigned char* dst,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
773 int dststride )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
774 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
775 int x;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
776
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
777 while (h--) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
778 for (x = 0; x < w; x++) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
779 if (srca[x])
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
780 dst[x] = ((255 - srca[x]) & 0xF0) | (src[x] >> 4);
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
781 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
782 src += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
783 srca += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
784 dst += dststride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
785 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
786 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
787
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
788 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
789 clear_alpha( int x0, int y0,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
790 int w, int h )
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
791 {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
792 if (use_spic && !flipping && vo_osd_changed)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
793 subframe->FillRectangle( subframe, x0, y0, w, h );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
794 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
795
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
796 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
797 draw_alpha( int x0, int y0,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
798 int w, int h,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
799 unsigned char *src,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
800 unsigned char *srca,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
801 int stride )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
802 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
803 void *dst;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
804 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
805
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
806 if (use_spic) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
807 if (!osd_changed || (!flipping && !vo_osd_changed))
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
808 return;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
809 osd_dirty |= osd_current;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
810 } else if (use_crtc2) {
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
811 if (x0 < drect.x ||
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
812 y0 < drect.y ||
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
813 x0 + w > drect.x + drect.w ||
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
814 y0 + h > drect.y + drect.h)
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
815 osd_dirty |= osd_current;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
816 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
817
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
818 if (subframe->Lock( subframe, DSLF_READ | DSLF_WRITE, &dst, &pitch ) != DFB_OK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
819 return;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
820
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
821 switch (subframe_format) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
822 case DSPF_ALUT44:
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
823 vo_draw_alpha_alut44( w, h, src, srca, stride,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
824 ((uint8_t *) dst) + pitch * y0 + x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
825 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
826 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
827 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
828 case DSPF_ARGB:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
829 vo_draw_alpha_rgb32( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
830 (( uint8_t *) dst) + pitch * y0 + 4 * x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
831 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
832 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
833 case DSPF_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
834 vo_draw_alpha_rgb24( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
835 ((uint8_t *) dst) + pitch * y0 + 3 * x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
836 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
837 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
838 case DSPF_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
839 vo_draw_alpha_rgb16( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
840 ((uint8_t *) dst) + pitch * y0 + 2 * x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
841 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
842 break;
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
843 case DSPF_ARGB1555:
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
844 vo_draw_alpha_rgb15( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
845 ((uint8_t *) dst) + pitch * y0 + 2 * x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
846 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
847 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
848 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
849 vo_draw_alpha_yuy2( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
850 ((uint8_t *) dst) + pitch * y0 + 2 * x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
851 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
852 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
853 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
854 vo_draw_alpha_yuy2( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
855 ((uint8_t *) dst) + pitch * y0 + 2 * x0 + 1,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
856 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
857 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
858 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
859 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
860 vo_draw_alpha_yv12( w, h, src, srca, stride,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
861 ((uint8_t *) dst) + pitch * y0 + x0,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
862 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
863 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
864 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
865
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
866 subframe->Unlock( subframe );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
867 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
868
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
869 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
870 draw_frame( uint8_t * src[] )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
871 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
872 return -1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
873 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
874
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
875 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
876 draw_slice( uint8_t * src[], int stride[], int w, int h, int x, int y )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
877 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
878 void *dst;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
879 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
880
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
881 if (frame->Lock( frame, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
882 return VO_FALSE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
883
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
884 memcpy_pic( dst + pitch * y + x, src[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
885 w, h, pitch, stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
886
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
887 dst += pitch * in_height;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
888
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
889 x /= 2; y /= 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
890 w /= 2; h /= 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
891 pitch /= 2;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
892
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
893 if (frame_format == DSPF_I420 )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
894 memcpy_pic( dst + pitch * y + x, src[1],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
895 w, h, pitch, stride[1] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
896 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
897 memcpy_pic( dst + pitch * y + x, src[2],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
898 w, h, pitch, stride[2] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
899
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
900 dst += pitch * in_height / 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
901
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
902 if (frame_format == DSPF_I420 )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
903 memcpy_pic( dst + pitch * y + x, src[2],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
904 w, h, pitch, stride[2] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
905 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
906 memcpy_pic( dst + pitch * y + x, src[1],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
907 w, h, pitch, stride[1] );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
908
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
909 frame->Unlock( frame );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
910
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
911 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
912 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
913
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
914 static void
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
915 blit_to_screen( void )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
916 {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
917 IDirectFBSurface *blitsrc = frame;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
918
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
919 if (use_bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
920 if (vo_vsync && !flipping && !use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
921 bes->WaitForSync( bes );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
922
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
923 besframe->Blit( besframe, blitsrc, NULL, 0, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
924 blitsrc = besframe;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
925 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
926
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
927 if (use_crtc2) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
928 if (vo_vsync && !flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
929 crtc2->WaitForSync( crtc2 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
930
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
931 if (stretch)
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
932 c2frame->StretchBlit( c2frame, blitsrc, NULL, &drect );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
933 else
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
934 c2frame->Blit( c2frame, blitsrc, NULL, drect.x, drect.y );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
935 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
936 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
937
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
938 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
939 draw_osd( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
940 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
941 frame = bufs[current_buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
942 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
943
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
944 osd_changed = vo_osd_changed( 0 );
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
945 if (osd_dirty & osd_current) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
946 if (use_spic) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
947 if (flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
948 subframe->Clear( subframe, 0, 0, 0, 0 );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
949 } else if (use_crtc2) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
950 /* Clear black bars around the picture */
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
951 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
952 0, 0,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
953 screen_width, drect.y );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
954 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
955 0, drect.y + drect.h,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
956 screen_width, drect.y );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
957 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
958 0, drect.y,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
959 drect.x, drect.h );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
960 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
961 drect.x + drect.w, drect.y,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
962 drect.x, drect.h );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
963 }
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
964 osd_dirty &= ~osd_current;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
965 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
966
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
967 blit_to_screen();
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
968 blit_done = 1;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
969
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
970 vo_remove_text( sub_width, sub_height, clear_alpha );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
971 vo_draw_text( sub_width, sub_height, draw_alpha );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
972
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
973 if (use_spic && flipping && osd_changed) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
974 subframe->Flip( subframe, NULL, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
975 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
976 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
977 osd_current = 1;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
978 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
979 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
980
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
981 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
982 flip_page( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
983 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
984 if (!blit_done)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
985 blit_to_screen();
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
986
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
987 if (flipping) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
988 if (use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
989 c2frame->Flip( c2frame, NULL, vo_vsync ? DSFLIP_WAITFORSYNC : DSFLIP_ONSYNC );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
990 else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
991 besframe->Flip( besframe, NULL, vo_vsync ? DSFLIP_WAITFORSYNC : DSFLIP_ONSYNC );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
992
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
993 if (!use_spic) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
994 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
995 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
996 osd_current = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
997 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
998 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
999
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1000 blit_done = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1001 current_buf = 0;//vo_directrendering ? 0 : (current_buf + 1) % num_bufs;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1002 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1003
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1004 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1005 uninit( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1006 {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1007 if (buffer)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1008 buffer->Release( buffer );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1009 if (keyboard)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1010 keyboard->Release( keyboard );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1011 buffer = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1012 keyboard = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1013
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1014 while (num_bufs--) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1015 frame = bufs[num_bufs];
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1016 if (frame)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1017 frame->Release( frame );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1018 bufs[num_bufs] = NULL;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1019 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1020 if (bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1021 if (besframe)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1022 besframe->Release( besframe );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1023 bes->SetOpacity( bes, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1024 bes->Release( bes );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1025 besframe = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1026 bes = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1027 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1028 if (crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1029 if (c2frame)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1030 c2frame->Release( c2frame );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1031 crtc2->SetOpacity( crtc2, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1032 crtc2->Release( crtc2 );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1033 c2frame = NULL;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1034 crtc2 = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1035 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1036 if (spic) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1037 if (subframe)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1038 subframe->Release( subframe );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1039 spic->SetOpacity( spic, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1040 spic->Release( spic );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1041 subframe = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1042 spic = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1043 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1044
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1045 /*
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1046 * Don't release. Segfault in preinit() if
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1047 * DirectFBCreate() called more than once.
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1048 *
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1049 * dfb->Release( dfb );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1050 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1051 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1052
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1053 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1054 get_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1055 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1056 int buf = current_buf;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1057 void *dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1058 int pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1059
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1060 if (use_bes &&
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1061 (mpi->type == MP_IMGTYPE_STATIC ||
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1062 mpi->flags & MP_IMGFLAG_READABLE))
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1063 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1064
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1065 if (mpi->flags & MP_IMGFLAG_READABLE &&
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1066 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1067 if (num_bufs < 2)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1068 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1069
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1070 current_ip_buf ^= 1;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1071
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1072 if (mpi->type == MP_IMGTYPE_IPB && num_bufs < 3 && current_ip_buf)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1073 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1074
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1075 buf = current_ip_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1076
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1077 if (mpi->type == MP_IMGTYPE_IPB)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1078 buf++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1079 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1080 frame = bufs[buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1081 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1082
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1083 /* Always use DSLF_READ to preserve system memory copy */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1084 if (frame->Lock( frame, DSLF_WRITE | DSLF_READ,
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1085 &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1086 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1087
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1088 if ((mpi->width == pitch) ||
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1089 (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1090
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1091 mpi->planes[0] = dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1092 mpi->width = in_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1093 mpi->stride[0] = pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1094
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1095 if (mpi->flags & MP_IMGFLAG_PLANAR) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1096 mpi->stride[1] = mpi->stride[2] = pitch / 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1097
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1098 if (mpi->flags & MP_IMGFLAG_SWAPPED) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1099 mpi->planes[1] = dst + in_height * pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1100 mpi->planes[2] = mpi->planes[1] + in_height * pitch / 4;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1101 } else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1102 mpi->planes[2] = dst + in_height * pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1103 mpi->planes[1] = mpi->planes[2] + in_height * pitch / 4;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1104 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1105 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1106
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1107 mpi->flags |= MP_IMGFLAG_DIRECT;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1108 mpi->priv = (void *) buf;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1109 current_buf = buf;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1110
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1111 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1112 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1113
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1114 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1115
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1116 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1117 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1118
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1119
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1120
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1121 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1122 draw_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1123 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1124 if (mpi->flags & MP_IMGFLAG_DIRECT) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1125 current_buf = (int) mpi->priv;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1126 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1127 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1128 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1129 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1130
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1131 if (mpi->flags & MP_IMGFLAG_PLANAR)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1132 return draw_slice( mpi->planes, mpi->stride,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1133 mpi->w, mpi->h, 0, 0 );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1134 else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1135 void *dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1136 int pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1137
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1138 if (frame->Lock( frame, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1139 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1140 memcpy_pic( dst, mpi->planes[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1141 mpi->w * (mpi->bpp / 8), mpi->h,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1142 pitch, mpi->stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1143 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1144
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1145 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1146 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1147 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1148
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1149 static int
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1150 set_equalizer( char *data, int value )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1151 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1152 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1153 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1154 float factor = (float) 0xffff / 200.0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1155
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1156 ca.flags = DCAF_NONE;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1157
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1158 if (!strcasecmp( data, "brightness" )) {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1159 ca.flags |= DCAF_BRIGHTNESS;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1160 ca.brightness = value * factor + 0x8000;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1161 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1162 if (!strcasecmp( data, "contrast" )) {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1163 ca.flags |= DCAF_CONTRAST;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1164 ca.contrast = value * factor + 0x8000;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1165 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1166 if (!strcasecmp( data, "hue" )) {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1167 ca.flags |= DCAF_HUE;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1168 ca.hue = value * factor + 0x8000;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1169 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1170 if (!strcasecmp( data, "saturation" )) {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1171 ca.flags |= DCAF_SATURATION;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1172 ca.saturation = value * factor + 0x8000;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1173 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1174
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1175 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1176 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1177 res = crtc2->SetColorAdjustment( crtc2, &ca );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1178 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1179 res = bes->SetColorAdjustment( bes, &ca );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1180
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1181 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1182 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1183
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1184 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1185 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1186
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1187 static int
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1188 get_equalizer( char *data, int *value )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1189 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1190 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1191 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1192 float factor = 200.0 / (float) 0xffff;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1193
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1194 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1195 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1196 res = crtc2->GetColorAdjustment( crtc2, &ca );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1197 else
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1198 res = bes->GetColorAdjustment( bes, &ca );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1199
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1200 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1201 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1202
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1203 if (!strcasecmp( data, "brightness" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1204 (ca.flags & DCAF_BRIGHTNESS))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1205 *value = (ca.brightness - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1206 if (!strcasecmp( data, "contrast" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1207 (ca.flags & DCAF_CONTRAST))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1208 *value = (ca.contrast - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1209 if (!strcasecmp( data, "hue" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1210 (ca.flags & DCAF_HUE))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1211 *value = (ca.hue - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1212 if (!strcasecmp( data, "saturation" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1213 (ca.flags & DCAF_SATURATION))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1214 *value = (ca.saturation - 0x8000) * factor;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1215
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1216 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1217 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1218
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1219 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1220 control( uint32_t request, void *data, ... )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1221 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1222 switch (request) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1223 case VOCTRL_GUISUPPORT:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1224 case VOCTRL_GUI_NOWINDOW:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1225 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1226
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1227 case VOCTRL_QUERY_FORMAT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1228 return query_format( *((uint32_t *) data) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1229
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1230 case VOCTRL_GET_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1231 return get_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1232
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1233 case VOCTRL_DRAW_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1234 return draw_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1235
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1236 case VOCTRL_SET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1237 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1238 va_list ap;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1239 int value;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1240
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1241 va_start( ap, data );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1242 value = va_arg( ap, int );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1243 va_end( ap );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1244
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1245 return set_equalizer( data, value );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1246 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1247 case VOCTRL_GET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1248 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1249 va_list ap;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1250 int *value;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1251
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1252 va_start( ap, data );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1253 value = va_arg( ap, int* );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1254 va_end( ap );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1255
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1256 return get_equalizer( data, value );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1257 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1258 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1259
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1260 return VO_NOTIMPL;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1261 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1262
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1263 extern void mplayer_put_key( int code );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1264
9380
edfe34c5405d linux->osdep
arpi
parents: 9021
diff changeset
1265 #include "../osdep/keycodes.h"
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1266
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1267 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1268 check_events( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1269 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1270 DFBInputEvent event;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1271
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1272 if (!use_input)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1273 return;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1274
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1275 if (buffer->GetEvent( buffer, DFB_EVENT( &event )) == DFB_OK) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1276 if (event.type == DIET_KEYPRESS) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1277 switch (event.key_symbol) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1278 case DIKS_ESCAPE:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1279 mplayer_put_key( 'q' );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1280 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1281 case DIKS_PAGE_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1282 mplayer_put_key( KEY_PAGE_UP );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1283 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1284 case DIKS_PAGE_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1285 mplayer_put_key( KEY_PAGE_DOWN );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1286 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1287 case DIKS_CURSOR_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1288 mplayer_put_key( KEY_UP );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1289 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1290 case DIKS_CURSOR_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1291 mplayer_put_key( KEY_DOWN );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1292 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1293 case DIKS_CURSOR_LEFT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1294 mplayer_put_key( KEY_LEFT );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1295 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1296 case DIKS_CURSOR_RIGHT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1297 mplayer_put_key( KEY_RIGHT );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1298 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1299 case DIKS_INSERT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1300 mplayer_put_key( KEY_INSERT );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1301 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1302 case DIKS_DELETE:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1303 mplayer_put_key( KEY_DELETE );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1304 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1305 case DIKS_HOME:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1306 mplayer_put_key( KEY_HOME );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1307 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1308 case DIKS_END:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1309 mplayer_put_key( KEY_END );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1310 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1311 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1312 mplayer_put_key( event.key_symbol );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1313 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1314 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1315 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1316
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1317 /*
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1318 * empty buffer, because of repeating
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1319 * keyboard repeat is faster than key handling and this causes problems during seek
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1320 * temporary workabout. should be solved in the future
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1321 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1322 buffer->Reset( buffer );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1323 }