annotate libvo/vo_dfbmga.c @ 36816:790318d7ce23

Don't automatically apply the Win32 GUI preferences' defaults. Just present them and let the user decide whether to apply or to cancel.
author ib
date Sun, 23 Feb 2014 19:35:08 +0000
parents 726678f7ce60
children 160b9ec5ebf4
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 /*
27582
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
2 * MPlayer video driver for DirectFB / Matrox G200/G400/G450/G550
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
3 *
27594
2a014f30d031 Update the copyright statement.
syrjala
parents: 27593
diff changeset
4 * copyright (C) 2002-2008 Ville Syrjala <syrjala@sci.fi>
27582
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
5 * Originally based on vo_directfb.c by Jiri Svoboda <Jiri.Svoboda@seznam.cz>.
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
6 *
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
7 * This file is part of MPlayer.
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
8 *
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
9 * MPlayer is free software; you can redistribute it and/or
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
10 * modify it under the terms of the GNU Lesser General Public
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
11 * License as published by the Free Software Foundation; either
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
12 * version 2.1 of the License, or (at your option) any later version.
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
13 *
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
14 * MPlayer is distributed in the hope that it will be useful,
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
17 * Lesser General Public License for more details.
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
18 *
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
19 * You should have received a copy of the GNU Lesser General Public License
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
20 * along with MPlayer; if not, write to the Free Software Foundation, Inc.,
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
21 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
34d3e0c8487a Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
diego
parents: 26755
diff changeset
22 */
8013
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 #include <directfb.h>
32168
c026f1657647 Simplify DirectFB check.
diego
parents: 27594
diff changeset
25 #include <directfb_version.h>
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
26 #include <stdio.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
27 #include <stdlib.h>
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
28 #include <string.h>
35903
389d43c448b3 Add missing strings.h #includes for strcasecmp().
diego
parents: 33313
diff changeset
29 #include <strings.h>
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
30
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
31 #include "config.h"
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
32 #include "video_out.h"
36517
5d3f93051de9 Remove empty draw_slice and draw_frame stubs.
reimar
parents: 35903
diff changeset
33 #define NO_DRAW_FRAME
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
34 #include "video_out_internal.h"
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
35 #include "libmpcodecs/vf.h"
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
36 #include "fastmemcpy.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32169
diff changeset
37 #include "sub/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"
22823
98eaf29b5dee Code cleanup: don't include a .c file in mplayer.c and fix a few
rathann
parents: 20279
diff changeset
40 #include "mp_fifo.h"
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
41
25216
3aee342be929 Make vo info structs const
reimar
parents: 24155
diff changeset
42 static const vo_info_t info = {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
43 "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
44 "dfbmga",
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
45 "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
46 ""
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
47 };
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
48
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
49 const LIBVO_EXTERN(dfbmga)
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8138
diff changeset
50
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
51 static IDirectFB *dfb;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
52
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
53 static IDirectFBDisplayLayer *crtc1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
54 static IDirectFBDisplayLayer *bes;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
55 static IDirectFBDisplayLayer *crtc2;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
56 static IDirectFBDisplayLayer *spic;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
57
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
58 static int num_bufs;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
59 static int current_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
60 static int current_ip_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
61 static IDirectFBSurface *bufs[3];
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
62
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
63 static IDirectFBSurface *frame;
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
64 static IDirectFBSurface *subframe;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
65
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
66 static IDirectFBSurface *besframe;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
67 static IDirectFBSurface *c1frame;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
68 static IDirectFBSurface *c2frame;
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
69 static IDirectFBSurface *spicframe;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
70
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
71 static DFBSurfacePixelFormat frame_format;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
72 static DFBSurfacePixelFormat subframe_format;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
73
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
74 static DFBRectangle besrect;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
75 static DFBRectangle c1rect;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
76 static DFBRectangle c2rect;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
77 static DFBRectangle *subrect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
78
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
79 static IDirectFBInputDevice *keyboard;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
80 static IDirectFBInputDevice *remote;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
81 static IDirectFBEventBuffer *buffer;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
82
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
83 static int blit_done;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
84 static int c1stretch;
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
85 static int c2stretch;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
86
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
87 static int use_bes;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
88 static int use_crtc1;
9021
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;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
92 static int use_remote;
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
93 static int field_parity;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
94 static int flipping;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
95 static DFBDisplayLayerBufferMode buffermode;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
96 static int tvnorm;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
97
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
98 static int osd_changed;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
99 static int osd_dirty;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
100 static int osd_current;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
101 static int osd_max;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
102
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
103 static int is_g200;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
104
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
105 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
106 static uint32_t in_height;
20278
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
107 static uint32_t buf_height;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
108 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
109 static uint32_t screen_height;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
110 static uint32_t sub_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
111 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
112
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
113 static char *
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
114 pixelformat_name( DFBSurfacePixelFormat format )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
115 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
116 switch(format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
117 case DSPF_ARGB:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
118 return "ARGB";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
119 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
120 return "RGB32";
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
121 case DSPF_RGB16:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
122 return "RGB16";
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
123 case DSPF_ARGB1555:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
124 return "ARGB1555";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
125 case DSPF_YUY2:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
126 return "YUY2";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
127 case DSPF_UYVY:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
128 return "UYVY";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
129 case DSPF_YV12:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
130 return "YV12";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
131 case DSPF_I420:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
132 return "I420";
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
133 case DSPF_ALUT44:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
134 return "ALUT44";
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
135 case DSPF_NV12:
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
136 return "NV12";
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
137 case DSPF_NV21:
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
138 return "NV21";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
139 default:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
140 return "Unknown pixel format";
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
141 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
142 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
143
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
144 static DFBSurfacePixelFormat
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
145 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
146 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
147 switch (format) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
148 case IMGFMT_BGR32:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
149 return DSPF_RGB32;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
150 case IMGFMT_BGR16:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
151 return DSPF_RGB16;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
152 case IMGFMT_BGR15:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
153 return DSPF_ARGB1555;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
154 case IMGFMT_YUY2:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
155 return DSPF_YUY2;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
156 case IMGFMT_UYVY:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
157 return DSPF_UYVY;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
158 case IMGFMT_YV12:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
159 return DSPF_YV12;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
160 case IMGFMT_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
161 case IMGFMT_IYUV:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
162 return DSPF_I420;
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
163 case IMGFMT_NV12:
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
164 return DSPF_NV12;
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
165 case IMGFMT_NV21:
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
166 return DSPF_NV21;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
167 default:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
168 return DSPF_UNKNOWN;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
169 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
170 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
171
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
172 struct layer_enum
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
173 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
174 const char *name;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
175 IDirectFBDisplayLayer **layer;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
176 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
177 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
178
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
179 static DFBEnumerationResult
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
180 get_layer_by_name( DFBDisplayLayerID id,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
181 DFBDisplayLayerDescription desc,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
182 void *data )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
183 {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
184 struct layer_enum *l = (struct layer_enum *) data;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
185
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
186 if (!strcmp( l->name, desc.name ))
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
187 if ((l->res = dfb->GetDisplayLayer( dfb, id, l->layer )) == DFB_OK)
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
188 return DFENUM_CANCEL;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
189
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
190 return DFENUM_OK;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
191 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
192
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
193 static int
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
194 preinit( const char *arg )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
195 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
196 DFBResult res;
13459
5634013c47c8 Fixed [no]input suboptions.
syrjala
parents: 13060
diff changeset
197 int force_input = -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
198
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
199 /* Some defaults */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
200 use_bes = 0;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
201 use_crtc1 = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
202 use_crtc2 = 1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
203 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
204 field_parity = -1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
205 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
206 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
207 flipping = 1;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
208 tvnorm = -1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
209
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
210 use_input = !getenv( "DISPLAY" );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
211
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
212 if (vo_subdevice) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
213 int show_help = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
214 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
215 while (*vo_subdevice != '\0') {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
216 if (!strncmp(vo_subdevice, "bes", 3)) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
217 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
218 vo_subdevice += 3;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
219 opt_no = 0;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
220 } else if (!strncmp(vo_subdevice, "crtc1", 5)) {
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
221 use_crtc1 = !opt_no;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
222 vo_subdevice += 5;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
223 opt_no = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
224 } else if (!strncmp(vo_subdevice, "crtc2", 5)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
225 use_crtc2 = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
226 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
227 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
228 } else if (!strncmp(vo_subdevice, "spic", 4)) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
229 use_spic = !opt_no;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
230 vo_subdevice += 4;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
231 opt_no = 0;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
232 } else if (!strncmp(vo_subdevice, "input", 5)) {
13459
5634013c47c8 Fixed [no]input suboptions.
syrjala
parents: 13060
diff changeset
233 force_input = !opt_no;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
234 vo_subdevice += 5;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
235 opt_no = 0;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
236 } else if (!strncmp(vo_subdevice, "remote", 6)) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
237 use_remote = !opt_no;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
238 vo_subdevice += 6;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
239 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
240 } else if (!strncmp(vo_subdevice, "buffermode=", 11)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
241 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
242 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
243 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
244 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
245 vo_subdevice += 11;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
246 if (!strncmp(vo_subdevice, "single", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
247 buffermode = DLBM_FRONTONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
248 osd_max = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
249 flipping = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
250 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
251 } else if (!strncmp(vo_subdevice, "double", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
252 buffermode = DLBM_BACKVIDEO;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
253 osd_max = 2;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
254 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
255 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
256 } else if (!strncmp(vo_subdevice, "triple", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
257 buffermode = DLBM_TRIPLE;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
258 osd_max = 4;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
259 flipping = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
260 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
261 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
262 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
263 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
264 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
265 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
266 } else if (!strncmp(vo_subdevice, "fieldparity=", 12)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
267 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
268 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
269 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
270 }
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
271 vo_subdevice += 12;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
272 if (!strncmp(vo_subdevice, "top", 3)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
273 field_parity = 0;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
274 vo_subdevice += 3;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
275 } else if (!strncmp(vo_subdevice, "bottom", 6)) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
276 field_parity = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
277 vo_subdevice += 6;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
278 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
279 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
280 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
281 }
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
282 opt_no = 0;
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
283 } else if (!strncmp(vo_subdevice, "tvnorm=", 7)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
284 if (opt_no) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
285 show_help = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
286 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
287 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
288 vo_subdevice += 7;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
289 if (!strncmp(vo_subdevice, "pal", 3)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
290 tvnorm = 0;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
291 vo_subdevice += 3;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
292 } else if (!strncmp(vo_subdevice, "ntsc" , 4)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
293 tvnorm = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
294 vo_subdevice += 4;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
295 } else if (!strncmp(vo_subdevice, "auto" , 4)) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
296 tvnorm = 2;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
297 vo_subdevice += 4;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
298 } else {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
299 show_help = 1;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
300 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
301 }
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
302 opt_no = 0;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
303 } else if (!strncmp(vo_subdevice, "no", 2)) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
304 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
305 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
306 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
307 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
308 vo_subdevice += 2;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
309 opt_no = 1;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
310 } else if (*vo_subdevice == ':') {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
311 if (opt_no) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
312 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
313 break;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
314 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
315 vo_subdevice++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
316 opt_no = 0;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
317 } else {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
318 show_help = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
319 break;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
320 }
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
321 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
322 if (show_help) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
323 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
324 "\nvo_dfbmga command line help:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
325 "Example: mplayer -vo dfbmga:nocrtc2:bes:buffermode=single\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
326 "\nOptions (use 'no' prefix to disable):\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
327 " bes Use Backend Scaler\n"
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
328 " crtc1 Use CRTC1\n"
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
329 " crtc2 Use CRTC2\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
330 " spic Use hardware sub-picture for OSD\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
331 " input Use DirectFB for keyboard input\n"
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
332 " remote Use DirectFB for remote control input\n"
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
333 "\nOther options:\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
334 " buffermode=(single|double|triple)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
335 " single Use single buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
336 " double Use double buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
337 " triple Use triple buffering\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
338 " fieldparity=(top|bottom)\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
339 " top Top field first\n"
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
340 " bottom Bottom field first\n"
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
341 " tvnorm=(pal|ntsc|auto)\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
342 " pal Force PAL\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
343 " ntsc Force NTSC\n"
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
344 " auto Select according to FPS\n"
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
345 "\n" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
346 return -1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
347 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
348 }
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
349 if (!use_bes && !use_crtc1 && !use_crtc2) {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
350 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
351 return -1;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
352 }
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
353 if (use_bes && use_crtc1) {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
354 mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Both BES and CRTC1 outputs selected\n" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
355 return -1;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
356 }
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
357
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
358 if ((res = DirectFBInit( NULL, NULL )) != DFB_OK) {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
359 mp_msg( MSGT_VO, MSGL_ERR,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
360 "vo_dfbmga: DirectFBInit() failed - %s\n",
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
361 DirectFBErrorString( res ) );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
362 return -1;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
363 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
364
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
365 switch (tvnorm) {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
366 case 0:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
367 DirectFBSetOption( "matrox-tv-standard", "pal" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
368 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Forced TV standard to PAL\n" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
369 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
370 case 1:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
371 DirectFBSetOption( "matrox-tv-standard", "ntsc" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
372 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Forced TV standard to NTSC\n" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
373 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
374 case 2:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
375 if (vo_fps > 27) {
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
376 DirectFBSetOption( "matrox-tv-standard", "ntsc" );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
377 mp_msg( MSGT_VO, MSGL_INFO,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
378 "vo_dfbmga: Selected TV standard based upon FPS: NTSC\n" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
379 } else {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
380 DirectFBSetOption( "matrox-tv-standard", "pal" );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
381 mp_msg( MSGT_VO, MSGL_INFO,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
382 "vo_dfbmga: Selected TV standard based upon FPS: PAL\n" );
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
383 }
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
384 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
385 }
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
386
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
387 if ((res = DirectFBCreate( &dfb )) != DFB_OK) {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
388 mp_msg( MSGT_VO, MSGL_ERR,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
389 "vo_dfbmga: DirectFBCreate() failed - %s\n",
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
390 DirectFBErrorString( res ) );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
391 return -1;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
392 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
393
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
394 if (use_crtc1 || use_bes) {
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
395 struct layer_enum l = {
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
396 "FBDev Primary Layer",
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
397 &crtc1,
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
398 DFB_UNSUPPORTED
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
399 };
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
400 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
401 if (l.res != DFB_OK) {
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
402 mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Can't get CRTC1 layer - %s\n",
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
403 DirectFBErrorString( l.res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
404 uninit();
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
405 return -1;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
406 }
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
407 if ((res = crtc1->SetCooperativeLevel( crtc1, DLSCL_EXCLUSIVE )) != DFB_OK) {
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
408 mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to CRTC1 layer - %s\n",
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
409 DirectFBErrorString( res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
410 uninit();
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
411 return -1;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
412 }
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
413 use_input = 1;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
414 }
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
415
13459
5634013c47c8 Fixed [no]input suboptions.
syrjala
parents: 13060
diff changeset
416 if (force_input != -1)
5634013c47c8 Fixed [no]input suboptions.
syrjala
parents: 13060
diff changeset
417 use_input = force_input;
5634013c47c8 Fixed [no]input suboptions.
syrjala
parents: 13060
diff changeset
418
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
419 if (use_bes) {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
420 DFBDisplayLayerConfig dlc;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
421 DFBDisplayLayerConfigFlags failed;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
422 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
423 "Matrox Backend Scaler",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
424 &bes,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
425 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
426 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
427
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
428 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
429 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
430 mp_msg( MSGT_VO, MSGL_ERR, "Can't get BES layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
431 DirectFBErrorString( l.res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
432 uninit();
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
433 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
434 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
435 if ((res = bes->SetCooperativeLevel( bes, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
436 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
437 DirectFBErrorString( res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
438 uninit();
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
439 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
440 }
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
441 dlc.flags = DLCONF_PIXELFORMAT;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
442 dlc.pixelformat = DSPF_RGB16;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
443 if (bes->TestConfiguration( bes, &dlc, &failed ) != DFB_OK) {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
444 is_g200 = 1;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
445 use_crtc2 = 0;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
446 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
447 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
448
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
449 if (use_crtc2) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
450 struct layer_enum l = {
11866
bfc01249a7bc support for latest CVS, patch by Ville Syrjala
alex
parents: 11157
diff changeset
451 "Matrox CRTC2 Layer",
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
452 &crtc2,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
453 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
454 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
455
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
456 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
457 if (l.res != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
458 mp_msg( MSGT_VO, MSGL_ERR, "Can't get CRTC2 layer - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
459 DirectFBErrorString( l.res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
460 uninit();
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
461 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
462 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
463 if ((res = crtc2->SetCooperativeLevel( crtc2, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
464 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
465 DirectFBErrorString( res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
466 uninit();
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
467 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
468 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
469 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
470
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
471 if (use_input || use_remote) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
472 if ((res = dfb->CreateEventBuffer( dfb, &buffer )) != DFB_OK) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
473 mp_msg( MSGT_VO, MSGL_ERR,
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
474 "vo_dfbmga: Can't create event buffer - %s\n",
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
475 DirectFBErrorString( res ) );
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
476 uninit();
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
477 return -1;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
478 }
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
479 }
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
480
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
481 if (use_input) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
482 if ((res = dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
483 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
484 "vo_dfbmga: Can't get keyboard - %s\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
485 DirectFBErrorString( res ) );
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
486 uninit();
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
487 return -1;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
488 }
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
489 if ((res = keyboard->AttachEventBuffer( keyboard, buffer )) != DFB_OK) {
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
490 mp_msg( MSGT_VO, MSGL_ERR,
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
491 "vo_dfbmga: Can't attach event buffer to keyboard - %s\n",
14929
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
492 DirectFBErrorString( res ) );
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
493 uninit();
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
494 return -1;
3febdb2983e0 Clean up properly if preinit() fails.
syrjala
parents: 14716
diff changeset
495 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
496 }
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
497 if (use_remote) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
498 if ((res = dfb->GetInputDevice( dfb, DIDID_REMOTE, &remote )) != DFB_OK) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
499 mp_msg( MSGT_VO, MSGL_ERR,
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
500 "vo_dfbmga: Can't get remote control - %s\n",
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
501 DirectFBErrorString( res ) );
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
502 uninit();
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
503 return -1;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
504 }
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
505 if ((res = remote->AttachEventBuffer( remote, buffer )) != DFB_OK) {
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
506 mp_msg( MSGT_VO, MSGL_ERR,
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
507 "vo_dfbmga: Can't attach event buffer to remote control - %s\n",
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
508 DirectFBErrorString( res ) );
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
509 uninit();
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
510 return -1;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
511 }
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
512 }
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
513
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
514 return 0;
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
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
517 static void release_config( void )
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
518 {
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
519 if (spicframe)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
520 spicframe->Release( spicframe );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
521 if (spic)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
522 spic->Release( spic );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
523 if (c2frame)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
524 c2frame->Release( c2frame );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
525 if (c1frame)
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
526 c1frame->Release( c1frame );
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
527 if (besframe)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
528 besframe->Release( besframe );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
529 if (bufs[0])
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
530 bufs[0]->Release( bufs[0] );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
531 if (bufs[1])
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
532 bufs[1]->Release( bufs[1] );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
533 if (bufs[2])
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
534 bufs[2]->Release( bufs[2] );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
535
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
536 spicframe = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
537 spic = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
538 c2frame = NULL;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
539 c1frame = NULL;
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
540 besframe = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
541 bufs[0] = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
542 bufs[1] = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
543 bufs[2] = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
544 }
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
545
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
546 static int
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
547 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
548 uint32_t d_width, uint32_t d_height,
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14929
diff changeset
549 uint32_t flags,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
550 char *title,
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
551 uint32_t format )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
552 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
553 DFBResult res;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
554
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
555 DFBDisplayLayerConfig dlc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
556 DFBDisplayLayerConfigFlags failed;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
557
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
558 uint32_t out_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
559 uint32_t out_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
560
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
561 release_config();
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
562
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
563 in_width = width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
564 in_height = height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
565
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
566 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
567 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
568
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
569 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
570
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
571 {
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
572 /* 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
573 DFBSurfaceDescription dsc;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
574
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
575 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
576 DSDESC_PIXELFORMAT;
20278
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
577 dsc.width = (in_width + 15) & ~15;
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
578 dsc.height = (in_height + 15) & ~15;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
579 dsc.pixelformat = dlc.pixelformat;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
580
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
581 /* 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
582 if (use_bes) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
583 dsc.flags |= DSDESC_CAPS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
584 dsc.caps = DSCAPS_SYSTEMONLY;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
585 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
586
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
587 for (num_bufs = 0; num_bufs < 3; num_bufs++) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
588 if ((res = dfb->CreateSurface( dfb, &dsc, &bufs[num_bufs] )) != DFB_OK) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
589 if (num_bufs == 0) {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
590 mp_msg( MSGT_VO, MSGL_ERR,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
591 "vo_dfbmga: Can't create surfaces - %s!\n",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
592 DirectFBErrorString( res ) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
593 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
594 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
595 break;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
596 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
597 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
598 frame = bufs[0];
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
599 current_buf = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
600 current_ip_buf = 0;
20278
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
601 buf_height = dsc.height;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
602 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
603 frame->GetPixelFormat( frame, &frame_format );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
604 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
605 in_width, in_height,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
606 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
607
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
608
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
609 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
610 * BES
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
611 */
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
612 if (use_bes) {
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
613 aspect_save_screenres( 0x10000, 0x10000 );
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
614 aspect( &out_width, &out_height, A_ZOOM );
13027
1b340f237bad Fixed BES aspect ratio.
syrjala
parents: 13026
diff changeset
615 besrect.x = (0x10000 - out_width) * in_width / out_width / 2;
1b340f237bad Fixed BES aspect ratio.
syrjala
parents: 13026
diff changeset
616 besrect.y = (0x10000 - out_height) * in_height / out_height / 2;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
617 besrect.w = in_width;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
618 besrect.h = in_height;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
619
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
620 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
621 dlc.width = besrect.w + besrect.x * 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
622 dlc.height = besrect.h + besrect.y * 2;
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
623 dlc.buffermode = buffermode;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
624
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
625 if ((res = bes->TestConfiguration( bes, &dlc, &failed )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
626 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
627 "vo_dfbmga: Invalid BES configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
628 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
629 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
630 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
631 if ((res = bes->SetConfiguration( bes, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
632 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
633 "vo_dfbmga: BES configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
634 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
635 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
636 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
637 bes->GetSurface( bes, &besframe );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
638 besframe->SetBlittingFlags( besframe, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
639
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
640 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
641
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
642 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
643 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
644 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
645 besframe->Flip( besframe, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
646 besframe->Clear( besframe, 0, 0, 0, 0xff );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
647
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
648 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
649 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
650 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
651 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
652 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
653
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
654 /*
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
655 * CRTC1
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
656 */
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
657 if (use_crtc1) {
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
658 dlc.flags = DLCONF_BUFFERMODE;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
659 dlc.buffermode = buffermode;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
660
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
661 if ((res = crtc1->TestConfiguration( crtc1, &dlc, &failed )) != DFB_OK) {
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
662 mp_msg( MSGT_VO, MSGL_ERR,
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
663 "vo_dfbmga: Invalid CRTC1 configuration - %s!\n",
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
664 DirectFBErrorString( res ) );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
665 return -1;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
666 }
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
667 if ((res = crtc1->SetConfiguration( crtc1, &dlc )) != DFB_OK) {
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
668 mp_msg( MSGT_VO, MSGL_ERR,
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
669 "vo_dfbmga: CRTC1 configuration failed - %s!\n",
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
670 DirectFBErrorString( res ) );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
671 return -1;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
672 }
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
673 if ((res = crtc1->GetConfiguration( crtc1, &dlc )) != DFB_OK) {
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
674 mp_msg( MSGT_VO, MSGL_ERR,
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
675 "vo_dfbmga: Getting CRTC1 configuration failed - %s!\n",
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
676 DirectFBErrorString( res ) );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
677 return -1;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
678 }
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
679
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
680 crtc1->GetSurface( crtc1, &c1frame );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
681 c1frame->SetBlittingFlags( c1frame, DSBLIT_NOFX );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
682 c1frame->SetColor( c1frame, 0, 0, 0, 0xff );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
683
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
684 c1frame->GetSize( c1frame, &screen_width, &screen_height );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
685
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
686 aspect_save_screenres( screen_width, screen_height );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
687 aspect( &out_width, &out_height, (flags & VOFLAG_FULLSCREEN) ? A_ZOOM : A_NOZOOM );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
688
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
689 if (in_width != out_width || in_height != out_height)
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
690 c1stretch = 1;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
691 else
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
692 c1stretch = 0;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
693
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
694 c1rect.x = (screen_width - out_width) / 2;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
695 c1rect.y = (screen_height - out_height) / 2;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
696 c1rect.w = out_width;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
697 c1rect.h = out_height;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
698
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
699 c1frame->Clear( c1frame, 0, 0, 0, 0xff );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
700 c1frame->Flip( c1frame, NULL, 0 );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
701 c1frame->Clear( c1frame, 0, 0, 0, 0xff );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
702 c1frame->Flip( c1frame, NULL, 0 );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
703 c1frame->Clear( c1frame, 0, 0, 0, 0xff );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
704
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
705 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: CRTC1 using %s buffering\n",
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
706 dlc.buffermode == DLBM_TRIPLE ? "triple" :
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
707 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
708 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: CRTC1 surface %dx%d %s\n", screen_width, screen_height, pixelformat_name( dlc.pixelformat ) );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
709 }
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
710
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
711 /*
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
712 * CRTC2
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
713 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
714 if (use_crtc2) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
715 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE | DLCONF_OPTIONS;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
716 dlc.buffermode = buffermode;
12980
4cffd6585cd3 Don't use flicker filtering.
syrjala
parents: 12276
diff changeset
717 dlc.options = DLOP_NONE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
718
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
719 if (field_parity != -1) {
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
720 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
721 }
11987
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
722 mp_msg( MSGT_VO, MSGL_INFO, "vo_dfbmga: Field parity set to: ");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
723 switch (field_parity) {
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
724 case -1:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
725 mp_msg( MSGT_VO, MSGL_INFO, "Don't care\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
726 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
727 case 0:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
728 mp_msg( MSGT_VO, MSGL_INFO, "Top field first\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
729 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
730 case 1:
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
731 mp_msg( MSGT_VO, MSGL_INFO, "Bottom field first\n");
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
732 break;
5f780dae2cf3 fieldparity verbosity and tvnorm patch
attila
parents: 11866
diff changeset
733 }
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
734
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
735 switch (dlc.pixelformat) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
736 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
737 case DSPF_YV12:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
738 /* sub-picture supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
739 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
740
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
741 case DSPF_YUY2:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
742 case DSPF_UYVY:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
743 /* 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
744 dlc.pixelformat = DSPF_ARGB;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
745
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
746 /* fall through */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
747 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
748 /* sub-picture not supported */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
749 use_spic = 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
750 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
751
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
752 if ((res = crtc2->TestConfiguration( crtc2, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
753 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
754 "vo_dfbmga: Invalid CRTC2 configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
755 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
756 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
757 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
758 if ((res = crtc2->SetConfiguration( crtc2, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
759 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
760 "vo_dfbmga: CRTC2 configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
761 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
762 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
763 }
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
764
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 (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
766 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
767
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
768 crtc2->GetSurface( crtc2, &c2frame );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
769 c2frame->SetBlittingFlags( c2frame, DSBLIT_NOFX );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
770 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
771
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
772 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
773
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
774 /* 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
775 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
776 (in_width < screen_width))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
777 out_width = in_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
778 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
779 out_width = screen_width;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
780 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
781 (in_height < screen_height))
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
782 out_height = in_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
783 else
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
784 out_height = screen_height;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
785
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
786 aspect_save_screenres( out_width, out_height );
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 14929
diff changeset
787 aspect( &out_width, &out_height, (flags & VOFLAG_FULLSCREEN) ? A_ZOOM : A_NOZOOM );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
788
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
789 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
790 in_height != out_height)
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
791 c2stretch = 1;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
792 else
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
793 c2stretch = 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
794
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
795 c2rect.x = (screen_width - out_width) / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
796 c2rect.y = (screen_height - out_height) / 2;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
797 c2rect.w = out_width;
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
798 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
799
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
800 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
801 c2frame->Flip( c2frame, NULL, 0 );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
802 c2frame->Clear( c2frame, 0, 0, 0, 0xff );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
803 c2frame->Flip( c2frame, NULL, 0 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
804 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
805
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
806 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
807 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
808 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
12276
39c24343b2a9 Fixed CRTC2 surface size message.
syrjala
parents: 11987
diff changeset
809 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
810 } else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
811 use_spic = 0;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
812 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
813
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
814 /*
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
815 * Sub-picture
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
816 */
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
817 if (use_spic) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
818 /* 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
819 IDirectFBPalette *palette;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
820 DFBColor color;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
821 int i;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
822 struct layer_enum l = {
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
823 "Matrox CRTC2 Sub-Picture",
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
824 &spic,
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
825 DFB_UNSUPPORTED
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
826 };
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
827 dfb->EnumDisplayLayers( dfb, get_layer_by_name, &l );
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
828 if (l.res != DFB_OK) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
829 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
830 DirectFBErrorString( l.res ) );
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
831 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
832 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
833 if ((res = spic->SetCooperativeLevel( spic, DLSCL_EXCLUSIVE )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
834 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
835 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
836 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
837 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
838
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
839 dlc.flags = DLCONF_PIXELFORMAT | DLCONF_BUFFERMODE;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
840 dlc.pixelformat = DSPF_ALUT44;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
841 dlc.buffermode = buffermode;
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
842 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
843 dlc.options = DLOP_ALPHACHANNEL;
32169
e55fdf5b1dd7 Require DirectFB version 0.9.22.
diego
parents: 32168
diff changeset
844
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
845 if ((res = spic->TestConfiguration( spic, &dlc, &failed )) != DFB_OK) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
846 mp_msg( MSGT_VO, MSGL_ERR,
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
847 "vo_dfbmga: Invalid sub-picture configuration - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
848 DirectFBErrorString( res ) );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
849 return -1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
850 }
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
851 if ((res = spic->SetConfiguration( spic, &dlc )) != DFB_OK) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
852 mp_msg( MSGT_VO, MSGL_ERR,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
853 "vo_dfbmga: Sub-picture configuration failed - %s!\n",
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
854 DirectFBErrorString( res ) );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
855 return -1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
856 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
857
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
858 spic->GetSurface( spic, &spicframe );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
859
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
860 spicframe->GetPalette( spicframe, &palette );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
861 color.a = 0xff;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
862 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
863 color.r = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
864 color.g = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
865 color.b = i * 17;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
866 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
867 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
868 palette->Release( palette );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
869
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
870 spicframe->Clear( spicframe, 0, 0, 0, 0 );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
871 spicframe->Flip( spicframe, NULL, 0 );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
872 spicframe->Clear( spicframe, 0, 0, 0, 0 );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
873 spicframe->Flip( spicframe, NULL, 0 );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
874 spicframe->Clear( spicframe, 0, 0, 0, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
875
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
876 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
877 dlc.buffermode == DLBM_TRIPLE ? "triple" :
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
878 dlc.buffermode == DLBM_BACKVIDEO ? "double" : "single" );
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
879
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
880 subframe = spicframe;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
881 subrect = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
882 } else if (use_crtc2) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
883 /* 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
884 subframe = c2frame;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
885 subrect = &c2rect;
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
886 } else if (use_crtc1) {
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
887 /* Draw OSD to CRTC1 surface */
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
888 subframe = c1frame;
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
889 subrect = &c1rect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
890 } else {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
891 /* Draw OSD to BES surface */
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
892 subframe = besframe;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
893 subrect = &besrect;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
894 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
895
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
896 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
897 subframe->GetPixelFormat( subframe, &subframe_format );
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
898 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
899 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
900 pixelformat_name( subframe_format ),
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
901 use_crtc2 ? (use_spic ? "Sub-picture layer" : "CRTC2") :
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
902 use_crtc1 ? "CRTC1" : "BES" );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
903
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
904 osd_dirty = 0;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
905 osd_current = 1;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
906 blit_done = 0;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
907
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
908 return 0;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
909 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
910
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
911 static int
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
912 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
913 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
914 switch (format) {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
915 case IMGFMT_YV12:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
916 case IMGFMT_I420:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
917 case IMGFMT_IYUV:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
918 if (is_g200 || use_crtc1)
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
919 return 0;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
920 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
921 case IMGFMT_BGR32:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
922 case IMGFMT_BGR16:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
923 case IMGFMT_BGR15:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
924 if (is_g200 && use_bes)
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
925 return 0;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
926 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
927 case IMGFMT_UYVY:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
928 if (is_g200)
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
929 return 0;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
930 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
931 case IMGFMT_YUY2:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
932 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
933 case IMGFMT_NV12:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
934 case IMGFMT_NV21:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
935 if (use_crtc1 || use_crtc2)
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
936 return 0;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
937 break;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
938 default:
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
939 return 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
940 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
941
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25220
diff changeset
942 return VFCAP_HWSCALE_UP |
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
943 VFCAP_HWSCALE_DOWN |
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
944 VFCAP_CSP_SUPPORTED_BY_HW |
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
945 VFCAP_CSP_SUPPORTED |
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25220
diff changeset
946 VFCAP_OSD;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
947 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
948
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
949 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
950 vo_draw_alpha_alut44( int w, int h,
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
951 unsigned char* src,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
952 unsigned char *srca,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
953 int srcstride,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
954 unsigned char* dst,
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
955 int dststride )
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
956 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
957 int x;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
958
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
959 while (h--) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
960 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
961 if (srca[x])
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
962 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
963 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
964 src += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
965 srca += srcstride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
966 dst += dststride;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
967 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
968 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
969
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
970 static void
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
971 clear_alpha( int x0, int y0,
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
972 int w, int h )
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
973 {
20279
9c2bad38b1ce s/vo_osd_changed/vo_osd_changed_flag
syrjala
parents: 20278
diff changeset
974 if (use_spic && !flipping && vo_osd_changed_flag)
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
975 subframe->FillRectangle( subframe, x0, y0, w, h );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
976 }
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
977
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
978 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
979 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
980 int w, int h,
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
981 unsigned char *src,
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
982 unsigned char *srca,
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
983 int stride )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
984 {
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
985 uint8_t *dst;
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
986 void *ptr;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
987 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
988
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
989 if (use_spic) {
20279
9c2bad38b1ce s/vo_osd_changed/vo_osd_changed_flag
syrjala
parents: 20278
diff changeset
990 if (!osd_changed || (!flipping && !vo_osd_changed_flag))
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
991 return;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
992 osd_dirty |= osd_current;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
993 } else {
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
994 if (x0 < subrect->x ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
995 y0 < subrect->y ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
996 x0 + w > subrect->x + subrect->w ||
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
997 y0 + h > subrect->y + subrect->h)
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
998 osd_dirty |= osd_current;
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
999 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1000
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1001 if (subframe->Lock( subframe, DSLF_READ | DSLF_WRITE, &ptr, &pitch ) != DFB_OK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1002 return;
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1003 dst = ptr;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1004
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1005 switch (subframe_format) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1006 case DSPF_ALUT44:
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1007 vo_draw_alpha_alut44( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1008 dst + pitch * y0 + x0,
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1009 pitch );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1010 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1011 case DSPF_RGB32:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1012 case DSPF_ARGB:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1013 vo_draw_alpha_rgb32( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1014 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
1015 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1016 break;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1017 case DSPF_RGB16:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1018 vo_draw_alpha_rgb16( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1019 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
1020 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1021 break;
8640
554e6aa7da5f fix to compile with DirecFB 0.9.16
zdar
parents: 8202
diff changeset
1022 case DSPF_ARGB1555:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1023 vo_draw_alpha_rgb15( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1024 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
1025 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1026 break;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1027 case DSPF_YUY2:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1028 vo_draw_alpha_yuy2( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1029 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
1030 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1031 break;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1032 case DSPF_UYVY:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1033 vo_draw_alpha_yuy2( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1034 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
1035 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1036 break;
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1037 case DSPF_NV12:
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1038 case DSPF_NV21:
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1039 case DSPF_I420:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1040 case DSPF_YV12:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1041 vo_draw_alpha_yv12( w, h, src, srca, stride,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1042 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
1043 pitch );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1044 break;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1045 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1046
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1047 subframe->Unlock( subframe );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1048 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1049
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
1050 static int
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1051 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
1052 {
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1053 uint8_t *dst;
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1054 void *ptr;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1055 int pitch;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1056
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1057 if (frame->Lock( frame, DSLF_WRITE, &ptr, &pitch ) != DFB_OK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1058 return VO_FALSE;
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1059 dst = ptr;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1060
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1061 memcpy_pic( dst + pitch * y + x, src[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1062 w, h, pitch, stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1063
20278
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
1064 dst += pitch * buf_height;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1065
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1066 y /= 2;
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1067 h /= 2;
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1068
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1069 if (frame_format == DSPF_NV12 || frame_format == DSPF_NV21) {
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1070 memcpy_pic( dst + pitch * y + x, src[1],
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1071 w, h, pitch, stride[1] );
32169
e55fdf5b1dd7 Require DirectFB version 0.9.22.
diego
parents: 32168
diff changeset
1072 } else {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1073 x /= 2;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1074 w /= 2;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1075 pitch /= 2;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1076
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1077 if (frame_format == DSPF_I420 )
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1078 memcpy_pic( dst + pitch * y + x, src[1],
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1079 w, h, pitch, stride[1] );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1080 else
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1081 memcpy_pic( dst + pitch * y + x, src[2],
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1082 w, h, pitch, stride[2] );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1083
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1084 dst += pitch * buf_height / 2;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1085
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1086 if (frame_format == DSPF_I420 )
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1087 memcpy_pic( dst + pitch * y + x, src[2],
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1088 w, h, pitch, stride[2] );
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1089 else
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1090 memcpy_pic( dst + pitch * y + x, src[1],
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1091 w, h, pitch, stride[1] );
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1092 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1093
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1094 frame->Unlock( frame );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1095
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1096 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1097 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1098
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1099 static void
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1100 blit_to_screen( void )
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1101 {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1102 IDirectFBSurface *blitsrc = frame;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1103 DFBRectangle *srect = NULL;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1104
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1105 if (use_bes) {
27592
6398d845ae76 Don't limit BES to non-synced single buffering when CRTC2 is used.
syrjala
parents: 27591
diff changeset
1106 if (vo_vsync && !flipping)
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1107 bes->WaitForSync( bes );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1108
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1109 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
1110 blitsrc = besframe;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1111 srect = &besrect;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1112 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1113
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1114 if (use_crtc1) {
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1115 if (vo_vsync && !flipping)
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1116 crtc1->WaitForSync( crtc1 );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1117
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1118 if (c1stretch)
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1119 c1frame->StretchBlit( c1frame, blitsrc, srect, &c1rect );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1120 else
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1121 c1frame->Blit( c1frame, blitsrc, srect, c1rect.x, c1rect.y );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1122 }
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1123
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1124 if (use_crtc2) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1125 if (vo_vsync && !flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1126 crtc2->WaitForSync( crtc2 );
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1127
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1128 if (c2stretch)
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1129 c2frame->StretchBlit( c2frame, blitsrc, srect, &c2rect );
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1130 else
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1131 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
1132 }
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1133 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1134
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1135 static void
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1136 draw_osd( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1137 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1138 frame = bufs[current_buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1139 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1140
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1141 osd_changed = vo_osd_changed( 0 );
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1142 if (osd_dirty & osd_current) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1143 if (use_spic) {
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1144 if (flipping)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1145 subframe->Clear( subframe, 0, 0, 0, 0 );
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1146 } else {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1147 /* Clear black bars around the picture */
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1148 subframe->FillRectangle( subframe,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1149 0, 0,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1150 sub_width, subrect->y );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1151 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1152 0, subrect->y + subrect->h,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1153 sub_width, subrect->y );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1154 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1155 0, subrect->y,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1156 subrect->x, subrect->h );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1157 subframe->FillRectangle( subframe,
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1158 subrect->x + subrect->w, subrect->y,
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1159 subrect->x, subrect->h );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1160 }
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1161 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
1162 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1163
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1164 blit_to_screen();
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1165 blit_done = 1;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1166
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1167 vo_remove_text( sub_width, sub_height, clear_alpha );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1168 vo_draw_text( sub_width, sub_height, draw_alpha );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1169
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1170 if (use_spic && flipping && osd_changed) {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1171 subframe->Flip( subframe, NULL, 0 );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1172 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1173 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1174 osd_current = 1;
8202
a90ecaca3989 This patch fixes the OSD flickering problem with vo_dfbmga.
arpi
parents: 8148
diff changeset
1175 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1176 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1177
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1178 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1179 flip_page( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1180 {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1181 if (!blit_done)
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1182 blit_to_screen();
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1183
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1184 if (flipping) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1185 if (use_crtc2)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1186 c2frame->Flip( c2frame, NULL, vo_vsync ? DSFLIP_WAITFORSYNC : DSFLIP_ONSYNC );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1187 if (use_crtc1)
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1188 c1frame->Flip( c1frame, NULL, vo_vsync ? DSFLIP_WAITFORSYNC : DSFLIP_ONSYNC );
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1189 if (use_bes)
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1190 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
1191
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1192 if (!use_spic) {
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1193 osd_current <<= 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1194 if (osd_current > osd_max)
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1195 osd_current = 1;
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1196 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1197 }
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1198
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1199 blit_done = 0;
11147
59e7beccdee0 Updates by Ville Syrj¸«£l¸«£ <syrjala@sci.fi>
alex
parents: 9979
diff changeset
1200 current_buf = 0;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1201 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1202
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1203 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1204 uninit( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1205 {
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1206 release_config();
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1207
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1208 if (buffer)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1209 buffer->Release( buffer );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1210 if (remote)
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1211 remote->Release( remote );
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1212 if (keyboard)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1213 keyboard->Release( keyboard );
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1214 if (crtc2)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1215 crtc2->Release( crtc2 );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1216 if (bes)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1217 bes->Release( bes );
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1218 if (crtc1)
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1219 crtc1->Release( crtc1 );
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1220 if (dfb)
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1221 dfb->Release( dfb );
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1222
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1223 buffer = NULL;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1224 remote = NULL;
9979
a4ea0311ade2 spring update patch by Ville Syrjala <syrjala@sci.fi>
alex
parents: 9461
diff changeset
1225 keyboard = NULL;
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1226 crtc2 = NULL;
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1227 bes = NULL;
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1228 crtc1 = NULL;
13026
ac2713aff2a7 Reorganized init/unint so that fixed-vo works.
syrjala
parents: 12980
diff changeset
1229 dfb = NULL;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1230 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1231
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1232 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1233 get_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1234 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1235 int buf = current_buf;
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1236 uint8_t *dst;
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1237 void *ptr;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1238 int pitch;
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 if (mpi->flags & MP_IMGFLAG_READABLE &&
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1241 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1242 if (num_bufs < 2)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1243 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1244
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1245 current_ip_buf ^= 1;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1246
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1247 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
1248 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1249
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1250 buf = current_ip_buf;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1251
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1252 if (mpi->type == MP_IMGTYPE_IPB)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1253 buf++;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1254 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1255 frame = bufs[buf];
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1256 frame->Unlock( frame );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1257
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1258 /* Always use DSLF_READ to preserve system memory copy */
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1259 if (frame->Lock( frame, DSLF_WRITE | DSLF_READ,
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1260 &ptr, &pitch ) != DFB_OK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1261 return VO_FALSE;
27583
7012606cf002 Eliminate void * arithmetic.
syrjala
parents: 27582
diff changeset
1262 dst = ptr;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1263
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1264 if ((mpi->width == pitch) ||
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1265 (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1266
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1267 mpi->planes[0] = dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1268 mpi->width = in_width;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1269 mpi->stride[0] = pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1270
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1271 if (mpi->flags & MP_IMGFLAG_PLANAR) {
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1272 if (mpi->num_planes > 2) {
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1273 mpi->stride[1] = mpi->stride[2] = pitch / 2;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1274
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1275 if (mpi->flags & MP_IMGFLAG_SWAPPED) {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1276 /* I420 */
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1277 mpi->planes[1] = dst + buf_height * pitch;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1278 mpi->planes[2] = mpi->planes[1] + buf_height * pitch / 4;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1279 } else {
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1280 /* YV12 */
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1281 mpi->planes[2] = dst + buf_height * pitch;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1282 mpi->planes[1] = mpi->planes[2] + buf_height * pitch / 4;
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1283 }
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1284 } else {
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1285 /* NV12/NV21 */
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1286 mpi->stride[1] = pitch;
20278
3c8ab2eecc74 Round buffer width and height to 16 pixels.
syrjala
parents: 20112
diff changeset
1287 mpi->planes[1] = dst + buf_height * pitch;
14716
7b2abc34b737 Added NV12/NV21 support.
syrjala
parents: 14626
diff changeset
1288 }
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1289 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1290
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1291 mpi->flags |= MP_IMGFLAG_DIRECT;
36761
726678f7ce60 vo_dfbmga: fix pointer cast size warnings.
reimar
parents: 36517
diff changeset
1292 mpi->priv = (void *)(intptr_t)buf;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1293 current_buf = buf;
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1294
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1295 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1296 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1297
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1298 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1299
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1300 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1301 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1302
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1303
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1304
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1305 static uint32_t
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1306 draw_image( mp_image_t *mpi )
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1307 {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1308 if (mpi->flags & MP_IMGFLAG_DIRECT) {
36761
726678f7ce60 vo_dfbmga: fix pointer cast size warnings.
reimar
parents: 36517
diff changeset
1309 current_buf = (intptr_t)mpi->priv;
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1310 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1311 }
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1312 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1313 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1314
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1315 if (mpi->flags & MP_IMGFLAG_PLANAR)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1316 return draw_slice( mpi->planes, mpi->stride,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1317 mpi->w, mpi->h, 0, 0 );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1318 else {
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1319 void *dst;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1320 int pitch;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1321
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1322 if (frame->Lock( frame, DSLF_WRITE, &dst, &pitch ) != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1323 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1324 memcpy_pic( dst, mpi->planes[0],
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1325 mpi->w * (mpi->bpp / 8), mpi->h,
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1326 pitch, mpi->stride[0] );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1327 frame->Unlock( frame );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1328
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1329 return VO_TRUE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1330 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1331 }
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1332
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1333 static int
33313
169a40da4c53 Add "const" to equalizer name argument to avoid compiler warnings.
reimar
parents: 33305
diff changeset
1334 set_equalizer( const 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
1335 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1336 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1337 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1338 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
1339
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1340 ca.flags = DCAF_NONE;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1341
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1342 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
1343 ca.flags |= DCAF_BRIGHTNESS;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1344 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
1345 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1346 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
1347 ca.flags |= DCAF_CONTRAST;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1348 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
1349 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1350 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
1351 ca.flags |= DCAF_HUE;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1352 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
1353 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1354 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
1355 ca.flags |= DCAF_SATURATION;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1356 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
1357 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1358
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1359 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1360 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1361 res = crtc2->SetColorAdjustment( crtc2, &ca );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1362 else if (use_crtc1)
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1363 res = crtc1->SetColorAdjustment( crtc1, &ca );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1364 else
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1365 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
1366
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1367 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1368 return VO_FALSE;
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1369
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1370 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1371 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1372
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1373 static int
33313
169a40da4c53 Add "const" to equalizer name argument to avoid compiler warnings.
reimar
parents: 33305
diff changeset
1374 get_equalizer( const 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
1375 {
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1376 DFBResult res;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1377 DFBColorAdjustment ca;
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1378 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
1379
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1380 /* Prefer CRTC2 over BES */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1381 if (use_crtc2)
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1382 res = crtc2->GetColorAdjustment( crtc2, &ca );
27590
4c4389f2aba2 Add CRTC1 support.
syrjala
parents: 27589
diff changeset
1383 else if (use_crtc1)
27591
5ab1614e3f0a Rename some variables and change some strings to make the CRTC1 code clearer.
syrjala
parents: 27590
diff changeset
1384 res = crtc1->GetColorAdjustment( crtc1, &ca );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1385 else
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1386 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
1387
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1388 if (res != DFB_OK)
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1389 return VO_FALSE;
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1390
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1391 if (!strcasecmp( data, "brightness" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1392 (ca.flags & DCAF_BRIGHTNESS))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1393 *value = (ca.brightness - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1394 if (!strcasecmp( data, "contrast" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1395 (ca.flags & DCAF_CONTRAST))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1396 *value = (ca.contrast - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1397 if (!strcasecmp( data, "hue" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1398 (ca.flags & DCAF_HUE))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1399 *value = (ca.hue - 0x8000) * factor;
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1400 if (!strcasecmp( data, "saturation" ) &&
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1401 (ca.flags & DCAF_SATURATION))
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1402 *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
1403
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1404 return VO_TRUE;
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1405 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1406
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
1407 static int
33305
ddb45e9443ec Remove the variable arguments from the libvo control() functions.
iive
parents: 33301
diff changeset
1408 control( uint32_t request, void *data )
8013
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 switch (request) {
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1411 case VOCTRL_GUISUPPORT:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1412 case VOCTRL_GUI_NOWINDOW:
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1413 return VO_TRUE;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1414
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1415 case VOCTRL_QUERY_FORMAT:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1416 return query_format( *((uint32_t *) data) );
8138
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1417
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1418 case VOCTRL_GET_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1419 return get_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1420
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1421 case VOCTRL_DRAW_IMAGE:
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1422 return draw_image( data );
ca825957ed02 This patch adds direct rendering to vo_dfbmga.
arpi
parents: 8121
diff changeset
1423
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1424 case VOCTRL_SET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1425 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
1426 vf_equalizer_t *eq=data;
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
1427 return set_equalizer( eq->item, eq->value );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1428 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1429 case VOCTRL_GET_EQUALIZER:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1430 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
1431 vf_equalizer_t *eq=data;
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
1432 return get_equalizer( eq->item, &eq->value );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1433 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1434 }
8121
89d0b7bbf043 - cleanup equalizer stuff (removed vidix dependency)
arpi
parents: 8080
diff changeset
1435
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1436 return VO_NOTIMPL;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1437 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1438
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13459
diff changeset
1439 #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
1440
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1441 static void
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1442 check_events( void )
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1443 {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1444 DFBInputEvent event;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1445
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1446 if (!buffer)
9021
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1447 return;
070b91093606 * Remove unneeded includes & macros
arpi
parents: 8640
diff changeset
1448
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1449 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
1450 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
1451 switch (event.key_symbol) {
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1452 case DIKS_ESCAPE:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1453 mplayer_put_key( KEY_ESC );
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1454 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1455 case DIKS_PAGE_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1456 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
1457 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1458 case DIKS_PAGE_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1459 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
1460 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1461 case DIKS_CURSOR_UP:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1462 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
1463 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1464 case DIKS_CURSOR_DOWN:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1465 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
1466 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1467 case DIKS_CURSOR_LEFT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1468 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
1469 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1470 case DIKS_CURSOR_RIGHT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1471 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
1472 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1473 case DIKS_INSERT:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1474 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
1475 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1476 case DIKS_DELETE:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1477 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
1478 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1479 case DIKS_HOME:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1480 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
1481 break;
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1482 case DIKS_END:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1483 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
1484 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1485
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1486 case DIKS_POWER:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1487 mplayer_put_key( KEY_POWER );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1488 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1489 case DIKS_MENU:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1490 mplayer_put_key( KEY_MENU );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1491 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1492 case DIKS_PLAY:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1493 mplayer_put_key( KEY_PLAY );
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1494 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1495 case DIKS_STOP:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1496 mplayer_put_key( KEY_STOP );
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1497 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1498 case DIKS_PAUSE:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1499 mplayer_put_key( KEY_PAUSE );
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1500 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1501 case DIKS_PLAYPAUSE:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1502 mplayer_put_key( KEY_PLAYPAUSE );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1503 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1504 case DIKS_FORWARD:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1505 mplayer_put_key( KEY_FORWARD );
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1506 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1507 case DIKS_NEXT:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1508 mplayer_put_key( KEY_NEXT );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1509 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1510 case DIKS_REWIND:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1511 mplayer_put_key( KEY_REWIND );
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1512 break;
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1513 case DIKS_PREVIOUS:
16896
5a9251e955df changed KEY_PREVIOUS to KEY_PREV, cause the first undefined
ptt
parents: 16892
diff changeset
1514 mplayer_put_key( KEY_PREV );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1515 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1516 case DIKS_VOLUME_UP:
27593
f75481d143ad Cosmetics:
syrjala
parents: 27592
diff changeset
1517 mplayer_put_key( KEY_VOLUME_UP );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1518 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1519 case DIKS_VOLUME_DOWN:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1520 mplayer_put_key( KEY_VOLUME_DOWN );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1521 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1522 case DIKS_MUTE:
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16864
diff changeset
1523 mplayer_put_key( KEY_MUTE );
16864
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1524 break;
bf0d9702546d Added support for remote controls.
syrjala
parents: 16171
diff changeset
1525
8013
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1526 default:
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1527 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
1528 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1529 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1530 }
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1531
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1532 /*
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1533 * 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
1534 * 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
1535 * 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
1536 */
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1537 buffer->Reset( buffer );
bd100a3d486f Here's a new vo plugin that uses DirectFB. It's meant for Matrox G400
arpi
parents:
diff changeset
1538 }