annotate libvo/vo_dfbmga.c @ 36260:a2750366a255

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