annotate libvo/vo_dfbmga.c @ 12956:4d6bbed2af6e

libosdep directory does not exist. osdep does.
author wight
date Wed, 04 Aug 2004 16:16:42 +0000
parents 39c24343b2a9
children 4cffd6585cd3
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 /*
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
2 MPlayer video driver for DirectFB / Matrox G200/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 = {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
42 "DirectFB / Matrox G200/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
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
78 static DFBRectangle besrect;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
79 static DFBRectangle c2rect;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
80 static DFBRectangle *subrect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
81
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
82 static IDirectFBInputDevice *keyboard;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
83 static IDirectFBEventBuffer *buffer;
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;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
95 static int tvnorm;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
96
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
97 static int osd_changed;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
98 static int osd_dirty;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
99 static int osd_current;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
100 static int osd_max;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
101
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
102 static int is_g200 = 0;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
103
8013
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 * vo_dfbmga *
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
106 ******************************/
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
107
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
108 #if DIRECTFBVERSION < 918
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
109 #define DSPF_ALUT44 DSPF_LUT8
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
110 #define DLBM_TRIPLE ~0
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
111 #define DSFLIP_ONSYNC 0
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
112 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
113
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
114 #if DIRECTFBVERSION < 916
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
115 #define DSPF_ARGB1555 DSPF_RGB15
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
116 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
117
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
118 /* 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
119 #ifdef HAVE_FBDEV
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
120 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
121 #else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
122 char *fb_dev_name;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
123 #endif
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
124
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
125 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
126 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
127 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
128 static uint32_t screen_height;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
129 static uint32_t sub_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
130 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
131
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
132 static char *
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
133 pixelformat_name( DFBSurfacePixelFormat format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
134 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
135 switch(format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
136 case DSPF_ARGB:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
137 return "ARGB";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
138 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
139 return "RGB32";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
140 case DSPF_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
141 return "RGB24";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
142 case DSPF_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
143 return "RGB16";
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
144 case DSPF_ARGB1555:
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
145 return "ARGB1555";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
146 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
147 return "YUY2";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
148 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
149 return "UYVY";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
150 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
151 return "YV12";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
152 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
153 return "I420";
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
154 case DSPF_ALUT44:
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
155 return "ALUT44";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
156 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
157 return "Unknown pixel format";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
158 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
159 }
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 static DFBSurfacePixelFormat
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
162 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
163 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
164 switch (format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
165 case IMGFMT_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
166 case IMGFMT_BGR32:
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
167 return DSPF_RGB32;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
168 case IMGFMT_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
169 case IMGFMT_BGR24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
170 return DSPF_RGB24;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
171 case IMGFMT_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
172 case IMGFMT_BGR16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
173 return DSPF_RGB16;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
174 case IMGFMT_RGB15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
175 case IMGFMT_BGR15:
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
176 return DSPF_ARGB1555;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
177 case IMGFMT_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
178 return DSPF_YUY2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
179 case IMGFMT_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
180 return DSPF_UYVY;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
181 case IMGFMT_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
182 return DSPF_YV12;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
183 case IMGFMT_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
184 case IMGFMT_IYUV:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
185 return DSPF_I420;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
186 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
187 return DSPF_UNKNOWN;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
188 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
189 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
190
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
191 struct layer_enum
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
192 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
193 const char *name;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
194 IDirectFBDisplayLayer **layer;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
195 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
196 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
197
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
198 static DFBEnumerationResult
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
199 get_layer_by_name( DFBDisplayLayerID id,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
200 DFBDisplayLayerDescription desc,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
201 void *data )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
202 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
203 struct layer_enum *l = (struct layer_enum *) data;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
204
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
205 #if DIRECTFBVERSION > 915
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
206 /* We have desc.name so use it */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
207 if (!strcmp( l->name, desc.name ))
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
208 if ((l->res = dfb->GetDisplayLayer( dfb, id, l->layer )) == DFB_OK)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
209 return DFENUM_CANCEL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
210 #else
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
211 /* Fake it according to id */
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
212 if ((id == 0 && !strcmp( l->name, "FBDev Primary Layer" )) ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
213 (id == 1 && !strcmp( l->name, "Matrox Backend Scaler" )) ||
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
214 (id == 2 && !strcmp( l->name, "Matrox CRTC2" )) ||
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
215 (id == 3 && !strcmp( l->name, "Matrox CRTC2 Sub-Picture" )))
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
216 if ((l->res = dfb->GetDisplayLayer( dfb, id, l->layer )) == DFB_OK)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
217 return DFENUM_CANCEL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
218 #endif
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
219
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
220 return DFENUM_OK;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
221 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
222
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
223 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
224 preinit( const char *arg )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
225 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
226 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
227
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
228 bes = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
229 crtc2 = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
230 keyboard = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
231 buffer = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
232
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
233 /* Some defaults */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
234 use_bes = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
235 use_crtc2 = 1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
236 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
237 field_parity = -1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
238 #if DIRECTFBVERSION > 917
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
239 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
240 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
241 #else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
242 buffermode = DLBM_BACKVIDEO;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
243 osd_max = 2;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
244 #endif
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
245 flipping = 1;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
246 tvnorm = -1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
247
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
248 use_input = !getenv( "DISPLAY" );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
249
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
250 if (vo_subdevice) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
251 int show_help = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
252 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
253 while (*vo_subdevice != '\0') {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
254 if (!strncmp(vo_subdevice, "bes", 3)) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
255 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
256 vo_subdevice += 3;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
257 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
258 } else if (!strncmp(vo_subdevice, "crtc2", 5)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
259 use_crtc2 = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
260 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
261 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
262 } else if (!strncmp(vo_subdevice, "spic", 4)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
263 use_spic = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
264 vo_subdevice += 4;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
265 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
266 } else if (!strncmp(vo_subdevice, "input", 5)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
267 use_input = !opt_no;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
268 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
269 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
270 } else if (!strncmp(vo_subdevice, "buffermode=", 11)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
271 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
272 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
273 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
274 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
275 vo_subdevice += 11;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
276 if (!strncmp(vo_subdevice, "single", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
277 buffermode = DLBM_FRONTONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
278 osd_max = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
279 flipping = 0;
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, "double", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
282 buffermode = DLBM_BACKVIDEO;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
283 osd_max = 2;
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 if (!strncmp(vo_subdevice, "triple", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
287 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
288 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
289 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
290 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
291 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
292 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
293 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
294 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
295 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
296 } else if (!strncmp(vo_subdevice, "fieldparity=", 12)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
297 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
298 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
299 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
300 }
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
301 vo_subdevice += 12;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
302 if (!strncmp(vo_subdevice, "top", 3)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
303 field_parity = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
304 vo_subdevice += 3;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
305 } else if (!strncmp(vo_subdevice, "bottom", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
306 field_parity = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
307 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
308 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
309 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
310 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
311 }
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
312 opt_no = 0;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
313 } else if (!strncmp(vo_subdevice, "tvnorm=", 7)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
314 if (opt_no) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
315 show_help = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
316 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
317 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
318 vo_subdevice += 7;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
319 if (!strncmp(vo_subdevice, "pal", 3)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
320 tvnorm = 0;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
321 vo_subdevice += 3;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
322 } else if (!strncmp(vo_subdevice, "ntsc" , 4)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
323 tvnorm = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
324 vo_subdevice += 4;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
325 } else if (!strncmp(vo_subdevice, "auto" , 4)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
326 tvnorm = 2;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
327 vo_subdevice += 4;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
328 } else {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
329 show_help = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
330 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
331 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
332 opt_no = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
333 } else if (!strncmp(vo_subdevice, "no", 2)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
334 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
335 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
336 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
337 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
338 vo_subdevice += 2;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
339 opt_no = 1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
340 } else if (*vo_subdevice == ':') {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
341 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
342 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
343 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
344 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
345 vo_subdevice++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
346 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
347 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
348 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
349 break;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
350 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
351 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
352 if (show_help) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
353 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
354 "\nvo_dfbmga command line help:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
355 "Example: mplayer -vo dfbmga:nocrtc2:bes:buffermode=single\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
356 "\nOptions (use 'no' prefix to disable):\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
357 " bes Use Backend Scaler\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
358 " crtc2 Use CRTC2\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
359 " spic Use hardware sub-picture for OSD\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
360 " input Use DirectFB for keyboard input\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
361 "\nOther options:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
362 " buffermode=(single|double|triple)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
363 " single Use single buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
364 " double Use double buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
365 " triple Use triple buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
366 " fieldparity=(top|bottom)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
367 " top Top field first\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
368 " bottom Bottom field first\n"
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
369 " tvnorm=(pal|ntsc|auto)\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
370 " pal Force PAL\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
371 " ntsc Force NTSC\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
372 " auto Select according to FPS\n"
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
373 "\n" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
374 return -1;
8013
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 && !use_crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
378 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
379 return -1;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
380 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
381
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
382 if ((res = DirectFBInit( NULL, NULL )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
383 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
384 "vo_dfbmga: DirectFBInit() failed - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
385 DirectFBErrorString( res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
386 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
387 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
388
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
389 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
390 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
391 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
392 DirectFBSetOption( "no-cursor", "" );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
393 DirectFBSetOption( "bg-color", "00000000" );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
394
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
395 switch (tvnorm) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
396 case 0:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
397 DirectFBSetOption( "matrox-tv-standard", "pal" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
398 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Forced TV standard to PAL\n" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
399 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
400 case 1:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
401 DirectFBSetOption( "matrox-tv-standard", "ntsc" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
402 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Forced TV standard to NTSC\n" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
403 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
404 case 2:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
405 if (vo_fps > 27) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
406 DirectFBSetOption( "matrox-tv-standard", "ntsc" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
407 mp_msg( MSGT_VO, MSGL_INFO,
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
408 "vo_dfbmga: Selected TV standard based upon FPS: NTSC\n" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
409 } else {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
410 DirectFBSetOption( "matrox-tv-standard", "pal" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
411 mp_msg( MSGT_VO, MSGL_INFO,
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
412 "vo_dfbmga: Selected TV standard based upon FPS: PAL\n" );
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
413 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
414 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
415 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
416
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
417 if ((res = DirectFBCreate( &dfb )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
418 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
419 "vo_dfbmga: DirectFBCreate() failed - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
420 DirectFBErrorString( res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
421 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
422 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
423
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
424 if (use_bes) {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
425 DFBDisplayLayerConfig dlc;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
426 DFBDisplayLayerConfigFlags failed;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
427 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
428 "Matrox Backend Scaler",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
429 &bes,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
430 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
431 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
432
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
433 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
434 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
435 mp_msg( MSGT_VO, MSGL_ERR, "Can't get BES layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
436 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
437 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
438 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
439 if ((res = bes->SetCooperativeLevel( bes, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
440 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
441 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
442 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
443 }
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
444 dlc.flags = DLCONF_PIXELFORMAT;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
445 dlc.pixelformat = DSPF_RGB16;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
446 if (bes->TestConfiguration( bes, &dlc, &failed ) != DFB_OK) {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
447 is_g200 = 1;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
448 use_crtc2 = 0;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
449 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
450 bes->SetOpacity( bes, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
451 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
452
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
453 if (use_crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
454 struct layer_enum l = {
11866
bfc01249a7bc support for latest CVS, patch by Ville Syrjala
alex
parents: 11157
diff changeset
455 #if DIRECTFBVERSION > 920
bfc01249a7bc support for latest CVS, patch by Ville Syrjala
alex
parents: 11157
diff changeset
456 "Matrox CRTC2 Layer",
bfc01249a7bc support for latest CVS, patch by Ville Syrjala
alex
parents: 11157
diff changeset
457 #else
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
458 "Matrox CRTC2",
11866
bfc01249a7bc support for latest CVS, patch by Ville Syrjala
alex
parents: 11157
diff changeset
459 #endif
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
460 &crtc2,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
461 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
462 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
463
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
464 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
465 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
466 mp_msg( MSGT_VO, MSGL_ERR, "Can't get CRTC2 layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
467 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
468 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
469 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
470 if ((res = crtc2->SetCooperativeLevel( crtc2, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
471 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
472 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
473 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
474 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
475 crtc2->SetOpacity( crtc2, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
476 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
477
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
478 if (use_input) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
479 if ((res = dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
480 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
481 "vo_dfbmga: Can't get keyboard - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
482 DirectFBErrorString( res ) );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
483 return -1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
484 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
485 keyboard->CreateEventBuffer( keyboard, &buffer );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
486 buffer->Reset( buffer );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
487 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
488
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
489 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
490 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
491
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
492 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
493 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
494 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
495 uint32_t fullscreen,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
496 char *title,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
497 uint32_t format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
498 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
499 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
500
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
501 DFBDisplayLayerConfig dlc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
502 DFBDisplayLayerConfigFlags failed;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
503
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
504 uint32_t out_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
505 uint32_t out_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
506
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
507 besframe = NULL;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
508 c2frame = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
509 spic = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
510 subframe = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
511 bufs[0] = bufs[1] = bufs[2] = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
512
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
513 in_width = width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
514 in_height = height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
515
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
516 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
517 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
518
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
519 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
520
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
521 {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
522 /* 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
523 DFBSurfaceDescription dsc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
524
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
525 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
526 DSDESC_PIXELFORMAT;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
527 dsc.width = in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
528 dsc.height = in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
529 dsc.pixelformat = dlc.pixelformat;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
530
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
531 /* 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
532 if (use_bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
533 dsc.flags |= DSDESC_CAPS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
534 dsc.caps = DSCAPS_SYSTEMONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
535 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
536
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
537 for (num_bufs = 0; num_bufs < 3; num_bufs++) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
538 if ((res = dfb->CreateSurface( dfb, &dsc, &bufs[num_bufs] )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
539 if (num_bufs == 0) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
540 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
541 "vo_dfbmga: Can't create surfaces - %s!\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
542 DirectFBErrorString( res ) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
543 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
544 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
545 break;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
546 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
547 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
548 frame = bufs[0];
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
549 current_buf = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
550 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
551 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
552 frame->GetPixelFormat( frame, &frame_format );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
553 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
554 in_width, in_height,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
555 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
556
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
557
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
558 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
559 * BES
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
560 */
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
561 if (use_bes) {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
562 IDirectFBDisplayLayer *primary;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
563 DFBDisplayLayerConfig pdlc;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
564 struct layer_enum l = {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
565 "FBDev Primary Layer",
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
566 &primary,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
567 DFB_UNSUPPORTED
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
568 };
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
569 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
570 if (l.res != DFB_OK) {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
571 mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Can't get primary layer - %s\n",
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
572 DirectFBErrorString( l.res ) );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
573 return -1;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
574 }
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
575 if ((res = primary->GetConfiguration( primary, &pdlc )) != DFB_OK) {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
576 mp_msg( MSGT_VO, MSGL_ERR,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
577 "vo_dfbmga: Can't get primary layer configuration - %s!\n",
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
578 DirectFBErrorString( res ) );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
579 return -1;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
580 }
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
581 primary->Release( primary );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
582
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
583 aspect_save_screenres( pdlc.width, pdlc.height );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
584 aspect( &out_width, &out_height, A_ZOOM );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
585 besrect.x = (pdlc.width - out_width) * in_width / pdlc.width / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
586 besrect.y = (pdlc.height - out_height) * in_height / pdlc.height / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
587 besrect.w = in_width;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
588 besrect.h = in_height;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
589
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
590 dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
591 dlc.width = besrect.w + besrect.x * 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
592 dlc.height = besrect.h + besrect.y * 2;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
593
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
594 if (use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
595 dlc.buffermode = DLBM_FRONTONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
596 else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
597 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
598
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
599 if ((res = bes->TestConfiguration( bes, &dlc, &failed )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
600 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
601 "vo_dfbmga: Invalid BES configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
602 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
603 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
604 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
605 if ((res = bes->SetConfiguration( bes, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
606 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
607 "vo_dfbmga: BES configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
608 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
609 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
610 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
611 bes->GetSurface( bes, &besframe );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
612 besframe->SetBlittingFlags( besframe, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
613
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
614 bes->SetScreenLocation( bes, 0.0, 0.0, 1.0, 1.0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
615
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
616 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
617 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
618 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
619 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
620 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
621
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
622 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
623 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
624 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
625 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
626 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
627
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
628 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
629 * CRTC2
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
630 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
631 if (use_crtc2) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
632 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE | DLCONF_OPTIONS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
633 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
634 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
635
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
636 #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
637 if (field_parity != -1) {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
638 dlc.options |= DLOP_FIELD_PARITY;
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
639 }
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
640 #endif
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
641 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Field parity set to: ");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
642 switch (field_parity) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
643 case -1:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
644 mp_msg( MSGT_VO, MSGL_INFO, "Don't care\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
645 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
646 case 0:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
647 mp_msg( MSGT_VO, MSGL_INFO, "Top field first\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
648 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
649 case 1:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
650 mp_msg( MSGT_VO, MSGL_INFO, "Bottom field first\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
651 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
652 }
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
653
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
654 switch (dlc.pixelformat) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
655 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
656 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
657 /* sub-picture supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
658 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
659
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
660 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
661 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
662 /* 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
663 dlc.pixelformat = DSPF_ARGB;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
664
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
665 /* fall through */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
666 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
667 /* sub-picture not supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
668 use_spic = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
669 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
670
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
671 if ((res = crtc2->TestConfiguration( crtc2, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
672 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
673 "vo_dfbmga: Invalid CRTC2 configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
674 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
675 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
676 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
677 if ((res = crtc2->SetConfiguration( crtc2, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
678 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
679 "vo_dfbmga: CRTC2 configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
680 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
681 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
682 }
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
683
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
684 #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
685 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
686 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
687 #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
688
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
689 crtc2->GetSurface( crtc2, &c2frame );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
690 c2frame->SetBlittingFlags( c2frame, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
691 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
692
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
693 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
694
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
695 /* 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
696 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
697 (in_width < screen_width))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
698 out_width = in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
699 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
700 out_width = screen_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
701 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
702 (in_height < screen_height))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
703 out_height = in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
704 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
705 out_height = screen_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
706
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
707 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
708 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
709
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
710 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
711 in_height != out_height)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
712 stretch = 1;
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 stretch = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
715
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
716 c2rect.x = (screen_width - out_width) / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
717 c2rect.y = (screen_height - out_height) / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
718 c2rect.w = out_width;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
719 c2rect.h = out_height;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
720
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
721 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
722 c2frame->Flip( c2frame, NULL, 0 );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
723 c2frame->Clear( c2frame, 0, 0, 0, 0xff );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
724 c2frame->Flip( c2frame, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
725 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
726
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
727 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
728 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
729 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
12276
39c24343b2a9 Fixed CRTC2 surface size message.
syrjala
parents: 11987
diff changeset
730 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: CRTC2 surface %dx%d %s\n", screen_width, screen_height, pixelformat_name( dlc.pixelformat ) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
731 } else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
732 use_spic = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
733 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
734
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
735 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
736 * Sub-picture
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
737 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
738 if (use_spic) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
739 /* 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
740 IDirectFBPalette *palette;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
741 DFBColor color;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
742 int i;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
743 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
744 "Matrox CRTC2 Sub-Picture",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
745 &spic,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
746 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
747 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
748 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
749 if (l.res != DFB_OK) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
750 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
751 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
752 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
753 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
754 if ((res = spic->SetCooperativeLevel( spic, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
755 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
756 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
757 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
758 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
759 spic->SetOpacity( spic, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
760
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
761 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
762 dlc.pixelformat = DSPF_ALUT44;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
763 dlc.buffermode = buffermode;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
764
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
765 #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
766 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
767 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
768 #endif
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
769 if ((res = spic->TestConfiguration( spic, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
770 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
771 "vo_dfbmga: Invalid sub-picture configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
772 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
773 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
774 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
775 if ((res = spic->SetConfiguration( spic, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
776 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
777 "vo_dfbmga: Sub-picture configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
778 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
779 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
780 }
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 spic->GetSurface( spic, &subframe );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
783
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
784 subframe->GetPalette( subframe, &palette );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
785 color.a = 0xff;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
786 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
787 color.r = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
788 color.g = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
789 color.b = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
790 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
791 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
792 palette->Release( palette );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
793
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
794 subframe->Clear( subframe, 0, 0, 0, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
795 subframe->Flip( subframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
796 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
797 subframe->Flip( subframe, NULL, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
798 subframe->Clear( subframe, 0, 0, 0, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
799
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
800 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
801 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
802 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
803 } else if (use_crtc2) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
804 /* 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
805 subframe = c2frame;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
806 subrect = &c2rect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
807 } else {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
808 /* Draw OSD to BES surface */
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
809 subframe = besframe;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
810 subrect = &besrect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
811 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
812
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
813 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
814 subframe->GetPixelFormat( subframe, &subframe_format );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
815 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
816 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
817 pixelformat_name( subframe_format ),
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
818 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
819
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
820 /* Display all needed layers */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
821 if (use_bes)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
822 bes->SetOpacity( bes, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
823 if (use_crtc2)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
824 crtc2->SetOpacity( crtc2, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
825 if (use_spic)
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
826 spic->SetOpacity( spic, 0xFF );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
827
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
828 osd_dirty = 0;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
829 osd_current = 1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
830 blit_done = 0;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
831
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
832 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
833 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
834
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
835 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
836 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
837 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
838 switch (format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
839 case IMGFMT_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
840 case IMGFMT_BGR32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
841 case IMGFMT_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
842 case IMGFMT_BGR24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
843 case IMGFMT_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
844 case IMGFMT_BGR16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
845 case IMGFMT_RGB15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
846 case IMGFMT_BGR15:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
847 case IMGFMT_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
848 case IMGFMT_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
849 case IMGFMT_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
850 case IMGFMT_IYUV:
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
851 if (is_g200)
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
852 return 0;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
853 case IMGFMT_YUY2:
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
854 return (VFCAP_HWSCALE_UP |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
855 VFCAP_HWSCALE_DOWN |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
856 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
857 VFCAP_CSP_SUPPORTED |
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
858 VFCAP_OSD);
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
859 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
860
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
861 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
862 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
863
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
864 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
865 vo_draw_alpha_alut44( int w, int h,
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
866 unsigned char* src,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
867 unsigned char *srca,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
868 int srcstride,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
869 unsigned char* dst,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
870 int dststride )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
871 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
872 int x;
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 while (h--) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
875 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
876 if (srca[x])
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
877 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
878 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
879 src += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
880 srca += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
881 dst += dststride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
882 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
883 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
884
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
885 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
886 clear_alpha( int x0, int y0,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
887 int w, int h )
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
888 {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
889 if (use_spic && !flipping && vo_osd_changed)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
890 subframe->FillRectangle( subframe, x0, y0, w, h );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
891 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
892
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
893 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
894 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
895 int w, int h,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
896 unsigned char *src,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
897 unsigned char *srca,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
898 int stride )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
899 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
900 void *dst;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
901 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
902
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
903 if (use_spic) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
904 if (!osd_changed || (!flipping && !vo_osd_changed))
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
905 return;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
906 osd_dirty |= osd_current;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
907 } else {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
908 if (x0 < subrect->x ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
909 y0 < subrect->y ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
910 x0 + w > subrect->x + subrect->w ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
911 y0 + h > subrect->y + subrect->h)
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
912 osd_dirty |= osd_current;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
913 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
914
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
915 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
916 return;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
917
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
918 switch (subframe_format) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
919 case DSPF_ALUT44:
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
920 vo_draw_alpha_alut44( w, h, src, srca, stride,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
921 ((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
922 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
923 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
924 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
925 case DSPF_ARGB:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
926 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
927 (( 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
928 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
929 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
930 case DSPF_RGB24:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
931 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
932 ((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
933 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
934 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
935 case DSPF_RGB16:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
936 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
937 ((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
938 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
939 break;
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
940 case DSPF_ARGB1555:
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
941 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
942 ((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
943 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
944 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
945 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
946 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
947 ((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
948 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
949 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
950 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
951 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
952 ((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
953 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
954 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
955 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
956 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
957 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
958 ((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
959 pitch );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
960 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
961 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
962
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
963 subframe->Unlock( subframe );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
964 }
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 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
967 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
968 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
969 return -1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
970 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
971
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
972 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
973 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
974 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
975 void *dst;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
976 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
977
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
978 if (frame->Lock( frame, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
979 return VO_FALSE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
980
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
981 memcpy_pic( dst + pitch * y + x, src[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
982 w, h, pitch, stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
983
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
984 dst += pitch * in_height;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
985
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
986 x /= 2; y /= 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
987 w /= 2; h /= 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
988 pitch /= 2;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
989
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
990 if (frame_format == DSPF_I420 )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
991 memcpy_pic( dst + pitch * y + x, src[1],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
992 w, h, pitch, stride[1] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
993 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
994 memcpy_pic( dst + pitch * y + x, src[2],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
995 w, h, pitch, stride[2] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
996
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
997 dst += pitch * in_height / 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
998
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
999 if (frame_format == DSPF_I420 )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1000 memcpy_pic( dst + pitch * y + x, src[2],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1001 w, h, pitch, stride[2] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1002 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1003 memcpy_pic( dst + pitch * y + x, src[1],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1004 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
1005
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1006 frame->Unlock( frame );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1007
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1008 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1009 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1010
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1011 static void
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1012 blit_to_screen( void )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1013 {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1014 IDirectFBSurface *blitsrc = frame;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1015 DFBRectangle *srect = NULL;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1016
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1017 if (use_bes) {
11157
c470a29b500b backward compatibility patch by Ville
alex
parents: 11147
diff changeset
1018 #if DIRECTFBVERSION > 915
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1019 if (vo_vsync && !flipping && !use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1020 bes->WaitForSync( bes );
11157
c470a29b500b backward compatibility patch by Ville
alex
parents: 11147
diff changeset
1021 #endif
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1022
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1023 besframe->Blit( besframe, blitsrc, NULL, besrect.x, besrect.y );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1024 blitsrc = besframe;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1025 srect = &besrect;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1026 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1027
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1028 if (use_crtc2) {
11157
c470a29b500b backward compatibility patch by Ville
alex
parents: 11147
diff changeset
1029 #if DIRECTFBVERSION > 915
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1030 if (vo_vsync && !flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1031 crtc2->WaitForSync( crtc2 );
11157
c470a29b500b backward compatibility patch by Ville
alex
parents: 11147
diff changeset
1032 #endif
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1033
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1034 if (stretch)
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1035 c2frame->StretchBlit( c2frame, blitsrc, srect, &c2rect );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1036 else
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1037 c2frame->Blit( c2frame, blitsrc, srect, c2rect.x, c2rect.y );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1038 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1039 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1040
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1041 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1042 draw_osd( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1043 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1044 frame = bufs[current_buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1045 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1046
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1047 osd_changed = vo_osd_changed( 0 );
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1048 if (osd_dirty & osd_current) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1049 if (use_spic) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1050 if (flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1051 subframe->Clear( subframe, 0, 0, 0, 0 );
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1052 } else {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1053 /* Clear black bars around the picture */
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1054 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1055 0, 0,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1056 sub_width, subrect->y );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1057 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1058 0, subrect->y + subrect->h,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1059 sub_width, subrect->y );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1060 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1061 0, subrect->y,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1062 subrect->x, subrect->h );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1063 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1064 subrect->x + subrect->w, subrect->y,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1065 subrect->x, subrect->h );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1066 }
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1067 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
1068 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1069
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1070 blit_to_screen();
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1071 blit_done = 1;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1072
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1073 vo_remove_text( sub_width, sub_height, clear_alpha );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1074 vo_draw_text( sub_width, sub_height, draw_alpha );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1075
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1076 if (use_spic && flipping && osd_changed) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1077 subframe->Flip( subframe, NULL, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1078 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1079 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1080 osd_current = 1;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1081 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1082 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1083
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1084 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1085 flip_page( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1086 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1087 if (!blit_done)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1088 blit_to_screen();
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1089
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1090 if (flipping) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1091 if (use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1092 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
1093 else
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1094 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
1095
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1096 if (!use_spic) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1097 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1098 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1099 osd_current = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1100 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1101 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1102
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1103 blit_done = 0;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1104 current_buf = 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1105 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1106
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1107 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1108 uninit( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1109 {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1110 if (buffer)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1111 buffer->Release( buffer );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1112 if (keyboard)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1113 keyboard->Release( keyboard );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1114 buffer = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1115 keyboard = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1116
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1117 while (num_bufs--) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1118 frame = bufs[num_bufs];
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1119 if (frame)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1120 frame->Release( frame );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1121 bufs[num_bufs] = NULL;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1122 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1123 if (bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1124 if (besframe)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1125 besframe->Release( besframe );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1126 bes->SetOpacity( bes, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1127 bes->Release( bes );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1128 besframe = NULL;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1129 bes = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1130 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1131 if (crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1132 if (c2frame)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1133 c2frame->Release( c2frame );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1134 crtc2->SetOpacity( crtc2, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1135 crtc2->Release( crtc2 );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1136 c2frame = NULL;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1137 crtc2 = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1138 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1139 if (spic) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1140 if (subframe)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1141 subframe->Release( subframe );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1142 spic->SetOpacity( spic, 0 );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1143 spic->Release( spic );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1144 subframe = NULL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1145 spic = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1146 }
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1147 if (dfb) {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1148 dfb->Release( dfb );
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1149 dfb = NULL;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1150 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1151 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1152
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1153 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1154 get_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1155 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1156 int buf = current_buf;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1157 void *dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1158 int pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1159
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1160 if (mpi->flags & MP_IMGFLAG_READABLE &&
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1161 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1162 if (num_bufs < 2)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1163 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1164
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1165 current_ip_buf ^= 1;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1166
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1167 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
1168 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1169
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1170 buf = current_ip_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1171
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1172 if (mpi->type == MP_IMGTYPE_IPB)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1173 buf++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1174 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1175 frame = bufs[buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1176 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1177
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1178 /* Always use DSLF_READ to preserve system memory copy */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1179 if (frame->Lock( frame, DSLF_WRITE | DSLF_READ,
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1180 &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1181 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1182
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1183 if ((mpi->width == pitch) ||
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1184 (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1185
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1186 mpi->planes[0] = dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1187 mpi->width = in_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1188 mpi->stride[0] = pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1189
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1190 if (mpi->flags & MP_IMGFLAG_PLANAR) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1191 mpi->stride[1] = mpi->stride[2] = pitch / 2;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1192
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1193 if (mpi->flags & MP_IMGFLAG_SWAPPED) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1194 mpi->planes[1] = dst + in_height * pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1195 mpi->planes[2] = mpi->planes[1] + in_height * pitch / 4;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1196 } else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1197 mpi->planes[2] = dst + in_height * pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1198 mpi->planes[1] = mpi->planes[2] + in_height * pitch / 4;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1199 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1200 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1201
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1202 mpi->flags |= MP_IMGFLAG_DIRECT;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1203 mpi->priv = (void *) buf;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1204 current_buf = buf;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1205
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1206 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1207 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1208
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1209 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1210
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1211 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1212 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1213
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1214
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1215
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1216 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1217 draw_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1218 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1219 if (mpi->flags & MP_IMGFLAG_DIRECT) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1220 current_buf = (int) mpi->priv;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1221 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1222 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1223 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1224 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1225
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1226 if (mpi->flags & MP_IMGFLAG_PLANAR)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1227 return draw_slice( mpi->planes, mpi->stride,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1228 mpi->w, mpi->h, 0, 0 );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1229 else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1230 void *dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1231 int pitch;
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 if (frame->Lock( frame, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1234 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1235 memcpy_pic( dst, mpi->planes[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1236 mpi->w * (mpi->bpp / 8), mpi->h,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1237 pitch, mpi->stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1238 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1239
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1240 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1241 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1242 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1243
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1244 static int
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1245 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
1246 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1247 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1248 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1249 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
1250
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1251 ca.flags = DCAF_NONE;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1252
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1253 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
1254 ca.flags |= DCAF_BRIGHTNESS;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1255 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
1256 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1257 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
1258 ca.flags |= DCAF_CONTRAST;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1259 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
1260 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1261 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
1262 ca.flags |= DCAF_HUE;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1263 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
1264 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1265 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
1266 ca.flags |= DCAF_SATURATION;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1267 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
1268 }
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 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1271 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1272 res = crtc2->SetColorAdjustment( crtc2, &ca );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1273 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1274 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
1275
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1276 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1277 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1278
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1279 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1280 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1281
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1282 static int
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1283 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
1284 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1285 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1286 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1287 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
1288
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1289 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1290 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1291 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
1292 else
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1293 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
1294
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1295 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1296 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1297
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1298 if (!strcasecmp( data, "brightness" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1299 (ca.flags & DCAF_BRIGHTNESS))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1300 *value = (ca.brightness - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1301 if (!strcasecmp( data, "contrast" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1302 (ca.flags & DCAF_CONTRAST))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1303 *value = (ca.contrast - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1304 if (!strcasecmp( data, "hue" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1305 (ca.flags & DCAF_HUE))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1306 *value = (ca.hue - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1307 if (!strcasecmp( data, "saturation" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1308 (ca.flags & DCAF_SATURATION))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1309 *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
1310
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1311 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1312 }
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 static uint32_t
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1315 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
1316 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1317 switch (request) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1318 case VOCTRL_GUISUPPORT:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1319 case VOCTRL_GUI_NOWINDOW:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1320 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1321
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1322 case VOCTRL_QUERY_FORMAT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1323 return query_format( *((uint32_t *) data) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1324
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1325 case VOCTRL_GET_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1326 return get_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1327
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1328 case VOCTRL_DRAW_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1329 return draw_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1330
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1331 case VOCTRL_SET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1332 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1333 va_list ap;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1334 int value;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1335
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1336 va_start( ap, data );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1337 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
1338 va_end( ap );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1339
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1340 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
1341 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1342 case VOCTRL_GET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1343 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1344 va_list ap;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1345 int *value;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1346
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1347 va_start( ap, data );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1348 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
1349 va_end( ap );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1350
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1351 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
1352 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1353 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1354
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1355 return VO_NOTIMPL;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1356 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1357
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1358 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
1359
9380
edfe34c5405d linux->osdep
arpi
parents: 9021
diff changeset
1360 #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
1361
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1362 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1363 check_events( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1364 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1365 DFBInputEvent event;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1366
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1367 if (!use_input)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1368 return;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1369
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1370 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
1371 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
1372 switch (event.key_symbol) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1373 case DIKS_ESCAPE:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1374 mplayer_put_key( 'q' );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1375 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1376 case DIKS_PAGE_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1377 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
1378 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1379 case DIKS_PAGE_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1380 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
1381 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1382 case DIKS_CURSOR_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1383 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
1384 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1385 case DIKS_CURSOR_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1386 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
1387 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1388 case DIKS_CURSOR_LEFT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1389 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
1390 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1391 case DIKS_CURSOR_RIGHT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1392 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
1393 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1394 case DIKS_INSERT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1395 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
1396 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1397 case DIKS_DELETE:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1398 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
1399 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1400 case DIKS_HOME:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1401 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
1402 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1403 case DIKS_END:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1404 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
1405 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1406 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1407 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
1408 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1409 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1410 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1411
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1412 /*
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1413 * 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
1414 * 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
1415 * 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
1416 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1417 buffer->Reset( buffer );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1418 }