annotate libvo/vo_xv.c @ 26730:41794a5fb100

Add a new suboption to -vo xv and -vo xvmc that allows selection of XVideo adaptor to be used (instead of default one, which is #0). This is useful for example if you'd rather like to use the original Overlay renderer of your GPU instead of the texture blitting engine (which is usually default), which is number one cause of nasty video tearing effects.
author ben
date Tue, 13 May 2008 17:52:25 +0000
parents 4f59356268a0
children 46f0b4d34fa1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
1 /* vo_xv.c, X11 Xv interface */
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
2
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
3 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
4 // Use option -double to enable double buffering! (default: single buffer)
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
5 #define NUM_BUFFERS 3
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
6
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
7 /*
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
8 Buffer allocation:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
9
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
10 -nodr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
11 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
12 2: 2*TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
13
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
14 -dr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
15 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
16 3: 2*STATIC+TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
17 */
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
18
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "config.h"
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
24 #include "mp_msg.h"
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
25 #include "help_mp.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
34 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
35
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
36 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
37 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
38 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
39
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
40 #include "subopt-helper.h"
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
41
24133
d43cda21236d Watch X11 fd in main input select() if using vo xv
uau
parents: 23656
diff changeset
42 #include "input/input.h"
d43cda21236d Watch X11 fd in main input select() if using vo xv
uau
parents: 23656
diff changeset
43
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
44 #ifdef HAVE_NEW_GUI
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22468
diff changeset
45 #include "gui/interface.h"
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
46 #endif
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
47
25963
4f59356268a0 Revert accidentally committed line of r25994.
cehoyos
parents: 25962
diff changeset
48 #include "libavutil/common.h"
22461
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
49
25216
3aee342be929 Make vo info structs const
reimar
parents: 24239
diff changeset
50 static const vo_info_t info = {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
51 "X11/Xv",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
52 "xv",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
53 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
54 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
57 const LIBVO_EXTERN(xv)
6719
5291d74a60c9 xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents: 6417
diff changeset
58 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 #include <X11/extensions/XShm.h>
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
62
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
63 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
6417
44bca09c1edd 100l accidently removed a line too much (Shmem_Flag)
atmos4
parents: 6416
diff changeset
64 static int Shmem_Flag;
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
65 #endif
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
66
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
67 // Note: depends on the inclusion of X11/extensions/XShm.h
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
68 #include <X11/extensions/Xv.h>
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
69 #include <X11/extensions/Xvlib.h>
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
70
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
71 // FIXME: dynamically allocate this stuff
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
72 static void allocate_xvimage(int);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
73 static unsigned int ver, rel, req, ev, err;
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
74 static unsigned int formats, adaptors, xv_format;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
75 static XvAdaptorInfo *ai = NULL;
13953
3dbebe82fc37 3 memory leaks fixed
iive
parents: 13914
diff changeset
76 static XvImageFormatValues *fo=NULL;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
77
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
78 static int current_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
79 static int current_ip_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
80 static int num_buffers = 1; // default
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
81 static int visible_buf = -1; // -1 means: no buffer was drawn yet
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
82 static XvImage *xvimage[NUM_BUFFERS];
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
83
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
84
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 static uint32_t image_format;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
88 static int flip_flag;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
90 static int int_pause;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
91
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
92 static Window mRoot;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
93 static uint32_t drwX, drwY, drwBorderWidth, drwDepth;
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
94 static uint32_t max_width = 0, max_height = 0; // zero means: not set
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
96 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
97 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
98 int stride);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
99
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
100 static void draw_alpha_yv12(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
101 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
102 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
103 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
104 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
105 vo_draw_alpha_yv12(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
106 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
107 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
108 xvimage[current_buf]->pitches[0] * y0 + x0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
109 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
110 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
111
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
112 static void draw_alpha_yuy2(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
113 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
114 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
115 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
116 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
117 vo_draw_alpha_yuy2(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
118 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
119 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
120 xvimage[current_buf]->pitches[0] * y0 + 2 * x0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
121 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
122 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
123
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
124 static void draw_alpha_uyvy(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
125 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
126 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
127 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
128 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
129 vo_draw_alpha_yuy2(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
130 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
131 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
132 xvimage[current_buf]->pitches[0] * y0 + 2 * x0 + 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
133 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
134 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
135
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
136 static void draw_alpha_null(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
137 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
138 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
139 {
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
140 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
141
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
142
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
143 static void deallocate_xvimage(int foo);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
144
22461
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
145 static void calc_drwXY(uint32_t *drwX, uint32_t *drwY) {
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
146 *drwX = *drwY = 0;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
147 if (vo_fs) {
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
148 aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
149 vo_dwidth = FFMIN(vo_dwidth, vo_screenwidth);
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
150 vo_dheight = FFMIN(vo_dheight, vo_screenheight);
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
151 *drwX = (vo_screenwidth - vo_dwidth) / 2;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
152 *drwY = (vo_screenheight - vo_dheight) / 2;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
153 mp_msg(MSGT_VO, MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
154 *drwX, *drwY, vo_dwidth, vo_dheight);
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
155 } else if (WinID == 0) {
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
156 *drwX = vo_dx;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
157 *drwY = vo_dy;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
158 }
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
159 }
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
160
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
161 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
162 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
165 static int config(uint32_t width, uint32_t height, uint32_t d_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
166 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
167 uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
169 XSizeHints hint;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
170 XVisualInfo vinfo;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
171 XGCValues xgcv;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
172 XSetWindowAttributes xswa;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
173 XWindowAttributes attribs;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
174 unsigned long xswamask;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
175 int depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
176
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
177 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
178 int vm = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
179 unsigned int modeline_width, modeline_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
180 static uint32_t vm_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
181 static uint32_t vm_height;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
182 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
183
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
184 image_height = height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
185 image_width = width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
186 image_format = format;
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
187
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
188 if ((max_width != 0 && max_height != 0) &&
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
189 (image_width > max_width || image_height > max_height))
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
190 {
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
191 mp_msg( MSGT_VO, MSGL_ERR, MSGTR_VO_XV_ImagedimTooHigh,
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
192 image_width, image_height, max_width, max_height);
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
193 return -1;
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
194 }
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
195
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
196 vo_mouse_autohide = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
197
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
198 int_pause = 0;
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
199 visible_buf = -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
201 #ifdef HAVE_XF86VM
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 15192
diff changeset
202 if (flags & VOFLAG_MODESWITCHING)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
203 vm = 1;
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
204 #endif
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 15192
diff changeset
205 flip_flag = flags & VOFLAG_FLIPPING;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
206 num_buffers =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
207 vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
208
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
209 /* check image formats */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
210 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
211 unsigned int i;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
212
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
213 xv_format = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
214 for (i = 0; i < formats; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
215 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
216 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
217 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
218 (char *) &fo[i].id,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
219 (fo[i].format == XvPacked) ? "packed" : "planar");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
220 if (fo[i].id == format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
221 xv_format = fo[i].id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
222 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
223 if (!xv_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
224 return -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
225 }
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
226
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
227 #ifdef HAVE_NEW_GUI
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
228 if (use_gui)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
229 guiGetEvent(guiSetShVideo, 0); // let the GUI to setup/resize our window
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
230 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
231 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
232 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
233 hint.x = vo_dx;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
234 hint.y = vo_dy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
235 hint.width = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
236 hint.height = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
237 #ifdef HAVE_XF86VM
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
238 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
239 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
240 if ((d_width == 0) && (d_height == 0))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
241 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
242 vm_width = image_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
243 vm_height = image_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
244 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
245 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
246 vm_width = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
247 vm_height = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
248 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
249 vo_vm_switch(vm_width, vm_height, &modeline_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
250 &modeline_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
251 hint.x = (vo_screenwidth - modeline_width) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
252 hint.y = (vo_screenheight - modeline_height) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
253 hint.width = modeline_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
254 hint.height = modeline_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
255 aspect_save_screenres(modeline_width, modeline_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
256 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
257 #endif
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
258 hint.flags = PPosition | PSize /* | PBaseSize */ ;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
259 hint.base_width = hint.width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
260 hint.base_height = hint.height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
261 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
262 &attribs);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
263 depth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
264 if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
265 depth = 24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
266 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
267
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
268 xswa.background_pixel = 0;
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
269 if (xv_ck_info.method == CK_METHOD_BACKGROUND)
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
270 {
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
271 xswa.background_pixel = xv_colorkey;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
272 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
273 xswa.border_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
274 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
275
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
276 if (WinID >= 0)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
277 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
278 vo_window = WinID ? ((Window) WinID) : mRootWin;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
279 if (WinID)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
280 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
281 XUnmapWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
282 XChangeWindowAttributes(mDisplay, vo_window, xswamask,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
283 &xswa);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
284 vo_x11_selectinput_witherr(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
285 StructureNotifyMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
286 KeyPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
287 PropertyChangeMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
288 PointerMotionMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
289 ButtonPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
290 ButtonReleaseMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
291 ExposureMask);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
292 XMapWindow(mDisplay, vo_window);
15540
91d210e8a19c Make -wid behave more consistent.
al
parents: 15212
diff changeset
293 XGetGeometry(mDisplay, vo_window, &mRoot,
91d210e8a19c Make -wid behave more consistent.
al
parents: 15212
diff changeset
294 &drwX, &drwY, &vo_dwidth, &vo_dheight,
91d210e8a19c Make -wid behave more consistent.
al
parents: 15212
diff changeset
295 &drwBorderWidth, &drwDepth);
22130
bca522054afe Sanity check for vo window dimensions, helps avoid division by zero
reimar
parents: 20765
diff changeset
296 if (vo_dwidth <= 0) vo_dwidth = d_width;
bca522054afe Sanity check for vo window dimensions, helps avoid division by zero
reimar
parents: 20765
diff changeset
297 if (vo_dheight <= 0) vo_dheight = d_height;
15540
91d210e8a19c Make -wid behave more consistent.
al
parents: 15212
diff changeset
298 aspect_save_prescale(vo_dwidth, vo_dheight);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
299 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
300 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
301 {
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
302 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
303 flags, CopyFromParent, "xv", title);
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
304 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
305 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
306
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
307 if (vo_gc != None)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
308 XFreeGC(mDisplay, vo_gc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
309 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
310 XSync(mDisplay, False);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
311 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
312 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
313 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
314 /* Grab the mouse pointer in our window */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
315 if (vo_grabpointer)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
316 XGrabPointer(mDisplay, vo_window, True, 0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
317 GrabModeAsync, GrabModeAsync,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
318 vo_window, None, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
319 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
320 }
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
321 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
322 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
323
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
324 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
325 xv_port);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
327 switch (xv_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
328 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
329 case IMGFMT_YV12:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
330 case IMGFMT_I420:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
331 case IMGFMT_IYUV:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
332 draw_alpha_fnc = draw_alpha_yv12;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
333 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
334 case IMGFMT_YUY2:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
335 case IMGFMT_YVYU:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
336 draw_alpha_fnc = draw_alpha_yuy2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
337 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
338 case IMGFMT_UYVY:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
339 draw_alpha_fnc = draw_alpha_uyvy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
340 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
341 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
342 draw_alpha_fnc = draw_alpha_null;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
343 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
344
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
345 if (vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
346 for (current_buf = 0; current_buf < num_buffers; ++current_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
347 deallocate_xvimage(current_buf);
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
348
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
349 for (current_buf = 0; current_buf < num_buffers; ++current_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
350 allocate_xvimage(current_buf);
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
351
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
352 current_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
353 current_ip_buf = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
355 #if 0
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
356 set_gamma_correction();
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
357 #endif
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
358
22468
ce47c5e803e2 100l, last patch broke window resizing with xv and xvmc.
reimar
parents: 22461
diff changeset
359 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
22461
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
360 if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) vo_fs = 1;
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
361 calc_drwXY(&drwX, &drwY);
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
362
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
363 panscan_calc();
18384
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
364
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
365 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1),
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
366 drwY - (vo_panscan_y >> 1),
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
367 vo_dwidth + vo_panscan_x - 1,
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
368 vo_dheight + vo_panscan_y - 1);
29a25bcb3d99 Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents: 18234
diff changeset
369
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
370
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
371 #if 0
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
372 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
373 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
374 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
375 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
376 xvimage[current_buf], 0, 0, image_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
377 image_height, drwX, drwY, 1, 1, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
378 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
379 xvimage[current_buf], 0, 0, image_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
380 image_height, drwX, drwY, vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
381 (vo_fs ? vo_dheight - 1 : vo_dheight), False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
382 } else
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
383 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
384 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
385 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
386 xvimage[current_buf], 0, 0, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
387 drwX, drwY, 1, 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
388 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
389 xvimage[current_buf], 0, 0, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
390 drwX, drwY, vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
391 (vo_fs ? vo_dheight - 1 : vo_dheight));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
392 }
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
393 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
394
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
395 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
396 drwY, vo_dwidth, vo_dheight);
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
397
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
398 if (vo_ontop)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
399 vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11183
diff changeset
400
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
401 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
402 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
403
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
404 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
405 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
406 /*
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
407 * allocate XvImages. FIXME: no error checking, without
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
408 * mit-shm this will bomb... trzing to fix ::atmos
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
409 */
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
410 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
411 if (mLocalDisplay && XShmQueryExtension(mDisplay))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
412 Shmem_Flag = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
413 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
414 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
415 Shmem_Flag = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
416 mp_msg(MSGT_VO, MSGL_INFO,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
417 MSGTR_LIBVO_XV_SharedMemoryNotSupported);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
418 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
419 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
420 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
421 xvimage[foo] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
422 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
423 NULL, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
424 &Shminfo[foo]);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
425
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
426 Shminfo[foo].shmid =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
427 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
428 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
429 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
430
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
431 xvimage[foo]->data = Shminfo[foo].shmaddr;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
432 XShmAttach(mDisplay, &Shminfo[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
433 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
434 shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
435 } else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
436 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
437 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
438 xvimage[foo] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
439 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
440 image_width, image_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
441 xvimage[foo]->data = malloc(xvimage[foo]->data_size);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
442 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
443 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
444 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
445 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
448 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
449 {
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
450 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
451 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
452 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
453 XShmDetach(mDisplay, &Shminfo[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
454 shmdt(Shminfo[foo].shmaddr);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
455 } else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
456 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
457 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
458 free(xvimage[foo]->data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
459 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
460 XFree(xvimage[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
461
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
462 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
463 return;
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
464 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
465
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
466 static inline void put_xvimage( XvImage * xvi )
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
467 {
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
468 #ifdef HAVE_SHM
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
469 if (Shmem_Flag)
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
470 {
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
471 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
472 xvi, 0, 0, image_width,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
473 image_height, drwX - (vo_panscan_x >> 1),
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
474 drwY - (vo_panscan_y >> 1), vo_dwidth + vo_panscan_x,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
475 vo_dheight + vo_panscan_y,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
476 False);
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
477 } else
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
478 #endif
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
479 {
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
480 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
481 xvi, 0, 0, image_width, image_height,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
482 drwX - (vo_panscan_x >> 1), drwY - (vo_panscan_y >> 1),
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
483 vo_dwidth + vo_panscan_x,
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
484 vo_dheight + vo_panscan_y);
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
485 }
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
486 }
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
487
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
488 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
489 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
490 int e = vo_x11_check_events(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
491
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
492 if (e & VO_EVENT_RESIZE)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
493 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
494 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
495 &vo_dheight, &drwBorderWidth, &drwDepth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
496 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
497 drwY, vo_dwidth, vo_dheight);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
498
22461
c54ad95f852a Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents: 22232
diff changeset
499 calc_drwXY(&drwX, &drwY);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
500 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
502 if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE)
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
503 {
15192
6b17eed33bdc more colorkey w/ panscan woes
henry
parents: 15190
diff changeset
504 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1),
6b17eed33bdc more colorkey w/ panscan woes
henry
parents: 15190
diff changeset
505 drwY - (vo_panscan_y >> 1),
6b17eed33bdc more colorkey w/ panscan woes
henry
parents: 15190
diff changeset
506 vo_dwidth + vo_panscan_x - 1,
6b17eed33bdc more colorkey w/ panscan woes
henry
parents: 15190
diff changeset
507 vo_dheight + vo_panscan_y - 1);
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
508 }
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
509
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
510 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause)
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
511 {
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
512 /* did we already draw a buffer */
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
513 if ( visible_buf != -1 )
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
514 {
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
515 /* redraw the last visible buffer */
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
516 put_xvimage( xvimage[visible_buf] );
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
517 }
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
518 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
519 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
520
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
521 static void draw_osd(void)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
522 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
523 vo_draw_text(image_width -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
524 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
525 image_height, draw_alpha_fnc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
526 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
527
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
528 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
529 {
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
530 put_xvimage( xvimage[current_buf] );
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
531
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
532 /* remember the currently visible buffer */
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
533 visible_buf = current_buf;
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
534
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
535 if (num_buffers > 1)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
536 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
537 current_buf =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
538 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
539 XFlush(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
540 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
541 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
542 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
544
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
545 static int draw_slice(uint8_t * image[], int stride[], int w, int h,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
546 int x, int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
547 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
548 uint8_t *dst;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
549
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
550 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
551 xvimage[current_buf]->pitches[0] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
552 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
553 stride[0]);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
554
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
555 x /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
556 y /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
557 w /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
558 h /= 2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
559
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
560 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
561 xvimage[current_buf]->pitches[1] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
562 if (image_format != IMGFMT_YV12)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
563 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
564 stride[1]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
565 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
566 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
567 stride[2]);
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
568
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
569 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
570 xvimage[current_buf]->pitches[2] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
571 if (image_format == IMGFMT_YV12)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
572 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
573 stride[1]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
574 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
575 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
576 stride[2]);
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
577
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
578 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
579 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
580
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
581 static int draw_frame(uint8_t * src[])
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
582 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 18116
diff changeset
583 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_XV_DrawFrameCalled);
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
584 return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
585 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
586
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
587 static uint32_t draw_image(mp_image_t * mpi)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
588 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
589 if (mpi->flags & MP_IMGFLAG_DIRECT)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
590 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
591 // direct rendering:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
592 current_buf = (int) (mpi->priv); // hack!
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
593 return VO_TRUE;
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
594 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
595 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
596 return VO_TRUE; // done
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
597 if (mpi->flags & MP_IMGFLAG_PLANAR)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
598 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
599 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
600 return VO_TRUE;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
601 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
602 if (mpi->flags & MP_IMGFLAG_YUV)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
603 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
604 // packed YUV:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
605 memcpy_pic(xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
606 xvimage[current_buf]->offsets[0], mpi->planes[0],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
607 mpi->w * (mpi->bpp / 8), mpi->h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
608 xvimage[current_buf]->pitches[0], mpi->stride[0]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
609 return VO_TRUE;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
610 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
611 return VO_FALSE; // not (yet) supported
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
612 }
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
613
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
614 static uint32_t get_image(mp_image_t * mpi)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
615 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
616 int buf = current_buf; // we shouldn't change current_buf unless we do DR!
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
617
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
618 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
619 return VO_FALSE; // it is not static
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
620 if (mpi->imgfmt != image_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
621 return VO_FALSE; // needs conversion :(
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
622 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
623 if (mpi->flags & MP_IMGFLAG_READABLE &&
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
624 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
625 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
626 // reference (I/P) frame of IP or IPB:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
627 if (num_buffers < 2)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
628 return VO_FALSE; // not enough
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
629 current_ip_buf ^= 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
630 // for IPB with 2 buffers we can DR only one of the 2 P frames:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
631 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
632 && current_ip_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
633 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
634 buf = current_ip_buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
635 if (mpi->type == MP_IMGTYPE_IPB)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
636 ++buf; // preserve space for B
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
637 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
638 if (mpi->height > xvimage[buf]->height)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
639 return VO_FALSE; //buffer to small
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
640 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0])
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
641 return VO_FALSE; //buffer to small
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
642 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
643 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0]))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
644 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
645 current_buf = buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
646 mpi->planes[0] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
647 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
648 mpi->stride[0] = xvimage[current_buf]->pitches[0];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
649 mpi->width = mpi->stride[0] / (mpi->bpp / 8);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
650 if (mpi->flags & MP_IMGFLAG_PLANAR)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
651 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
652 if (mpi->flags & MP_IMGFLAG_SWAPPED)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
653 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
654 // I420
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
655 mpi->planes[1] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
656 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
657 xvimage[current_buf]->offsets[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
658 mpi->planes[2] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
659 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
660 xvimage[current_buf]->offsets[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
661 mpi->stride[1] = xvimage[current_buf]->pitches[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
662 mpi->stride[2] = xvimage[current_buf]->pitches[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
663 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
664 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
665 // YV12
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
666 mpi->planes[1] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
667 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
668 xvimage[current_buf]->offsets[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
669 mpi->planes[2] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
670 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
671 xvimage[current_buf]->offsets[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
672 mpi->stride[1] = xvimage[current_buf]->pitches[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
673 mpi->stride[2] = xvimage[current_buf]->pitches[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
674 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
675 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
676 mpi->flags |= MP_IMGFLAG_DIRECT;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
677 mpi->priv = (void *) current_buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
678 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
679 return VO_TRUE;
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
680 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
681 return VO_FALSE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
682 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
683
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
684 static int query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
685 {
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
686 uint32_t i;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
687 int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
688
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
689 /* check image formats */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
690 for (i = 0; i < formats; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
691 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
692 if (fo[i].id == format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
693 return flag; //xv_format = fo[i].id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
694 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
695 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
696 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
697
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
698 static void uninit(void)
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
699 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
700 int i;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
701
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
702 if (!vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
703 return;
14782
b0b668d69632 Don't change buffers when paused and redrawing.
al
parents: 14742
diff changeset
704 visible_buf = -1;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
705 XvFreeAdaptorInfo(ai);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
706 ai = NULL;
13953
3dbebe82fc37 3 memory leaks fixed
iive
parents: 13914
diff changeset
707 if(fo){
3dbebe82fc37 3 memory leaks fixed
iive
parents: 13914
diff changeset
708 XFree(fo);
3dbebe82fc37 3 memory leaks fixed
iive
parents: 13914
diff changeset
709 fo=NULL;
3dbebe82fc37 3 memory leaks fixed
iive
parents: 13914
diff changeset
710 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
711 for (i = 0; i < num_buffers; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
712 deallocate_xvimage(i);
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
713 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
714 vo_vm_close(mDisplay);
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
715 #endif
24133
d43cda21236d Watch X11 fd in main input select() if using vo xv
uau
parents: 23656
diff changeset
716 mp_input_rm_event_fd(ConnectionNumber(mDisplay));
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
717 vo_x11_uninit();
322
4e69a8e2700a Screensaver and monitor powersafe function is switched off when playing a
laaz
parents: 249
diff changeset
718 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
719
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
720 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
721 {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
722 XvPortID xv_p;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
723 int busy_ports = 0;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
724 unsigned int i;
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
725 strarg_t ck_src_arg = { 0, NULL };
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
726 strarg_t ck_method_arg = { 0, NULL };
26730
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
727 int xv_adaptor = -1;
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
728
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
729 opt_t subopts[] =
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
730 {
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
731 /* name arg type arg var test */
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
732 { "port", OPT_ARG_INT, &xv_port, (opt_test_f)int_pos },
26730
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
733 { "adaptor", OPT_ARG_INT, &xv_adaptor, (opt_test_f)int_non_neg },
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
734 { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck },
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
735 { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm },
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
736 { NULL }
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
737 };
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
738
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
739 xv_port = 0;
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
740
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
741 /* parse suboptions */
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
742 if ( subopt_parse( arg, subopts ) != 0 )
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
743 {
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
744 return -1;
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
745 }
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
746
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
747 /* modify colorkey settings according to the given options */
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
748 xv_setup_colorkeyhandling( ck_method_arg.str, ck_src_arg.str );
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
749
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
750 if (!vo_init())
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
751 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
752
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
753 /* check for Xvideo extension */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
754 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
755 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
756 mp_msg(MSGT_VO, MSGL_ERR,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
757 MSGTR_LIBVO_XV_XvNotSupportedByX11);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
758 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
759 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
760
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
761 /* check for Xvideo support */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
762 if (Success !=
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
763 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
764 &ai))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
765 {
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
766 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_XV_XvQueryAdaptorsFailed);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
767 return -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
768 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
769
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
770 /* check adaptors */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
771 if (xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
772 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
773 int port_found;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
774
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
775 for (port_found = 0, i = 0; !port_found && i < adaptors; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
776 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
777 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
778 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
779 for (xv_p = ai[i].base_id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
780 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
781 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
782 if (xv_p == xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
783 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
784 port_found = 1;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
785 break;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
786 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
787 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
788 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
789 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
790 if (port_found)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
791 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
792 if (XvGrabPort(mDisplay, xv_port, CurrentTime))
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
793 xv_port = 0;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
794 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
795 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
796 mp_msg(MSGT_VO, MSGL_WARN,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
797 MSGTR_LIBVO_XV_InvalidPortParameter);
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
798 xv_port = 0;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
799 }
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
800 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
801
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
802 for (i = 0; i < adaptors && xv_port == 0; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
803 {
26730
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
804 /* check if adaptor number has been specified */
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
805 if (xv_adaptor != -1 && xv_adaptor != i)
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
806 continue;
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
807
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
808 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
809 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
810 for (xv_p = ai[i].base_id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
811 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
812 if (!XvGrabPort(mDisplay, xv_p, CurrentTime))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
813 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
814 xv_port = xv_p;
26730
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
815 mp_msg(MSGT_VO, MSGL_INFO,
41794a5fb100 Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents: 25963
diff changeset
816 MSGTR_LIBVO_XV_Adaptor, i, ai[i].name);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
817 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
818 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
819 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
820 mp_msg(MSGT_VO, MSGL_WARN,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
821 MSGTR_LIBVO_XV_CouldNotGrabPort, (int) xv_p);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
822 ++busy_ports;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
823 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
824 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
825 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
826 if (!xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
827 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
828 if (busy_ports)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
829 mp_msg(MSGT_VO, MSGL_ERR,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
830 MSGTR_LIBVO_XV_CouldNotFindFreePort);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
831 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
832 mp_msg(MSGT_VO, MSGL_ERR,
20765
dd41a1fc9000 MSGTRs for libvo/aspect.c and libvo/vo_xv.c
kraymer
parents: 18715
diff changeset
833 MSGTR_LIBVO_XV_NoXvideoSupport);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
834 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
835 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
836
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
837 if ( !vo_xv_init_colorkey() )
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
838 {
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 13953
diff changeset
839 return -1; // bail out, colorkey setup failed
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
840 }
15826
db966bdf6f5b Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents: 15540
diff changeset
841 vo_xv_enable_vsync();
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16171
diff changeset
842 vo_xv_get_max_img_dim( &max_width, &max_height );
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
843
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
844 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats);
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
845
24133
d43cda21236d Watch X11 fd in main input select() if using vo xv
uau
parents: 23656
diff changeset
846 mp_input_add_event_fd(ConnectionNumber(mDisplay), check_events);
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
847 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
848 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
849
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15826
diff changeset
850 static int control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
851 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
852 switch (request)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
853 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
854 case VOCTRL_PAUSE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
855 return (int_pause = 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
856 case VOCTRL_RESUME:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
857 return (int_pause = 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
858 case VOCTRL_QUERY_FORMAT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
859 return query_format(*((uint32_t *) data));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
860 case VOCTRL_GET_IMAGE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
861 return get_image(data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
862 case VOCTRL_DRAW_IMAGE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
863 return draw_image(data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
864 case VOCTRL_GUISUPPORT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
865 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
866 case VOCTRL_GET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
867 if (!vo_config_count || !vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
868 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
869 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
870 case VOCTRL_FULLSCREEN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
871 vo_x11_fullscreen();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
872 /* indended, fallthrough to update panscan on fullscreen/windowed switch */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
873 case VOCTRL_SET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
874 if ((vo_fs && (vo_panscan != vo_panscan_amount))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
875 || (!vo_fs && vo_panscan_amount))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
876 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
877 int old_y = vo_panscan_y;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
878
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
879 panscan_calc();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
880
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
881 if (old_y != vo_panscan_y)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
882 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
883 vo_x11_clearwindow_part(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
884 vo_dwidth + vo_panscan_x - 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
885 vo_dheight + vo_panscan_y - 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
886 1);
15190
4619b543c6c1 redraw colorkey on panscan change
henry
parents: 15186
diff changeset
887 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1),
4619b543c6c1 redraw colorkey on panscan change
henry
parents: 15186
diff changeset
888 drwY - (vo_panscan_y >> 1),
4619b543c6c1 redraw colorkey on panscan change
henry
parents: 15186
diff changeset
889 vo_dwidth + vo_panscan_x - 1,
4619b543c6c1 redraw colorkey on panscan change
henry
parents: 15186
diff changeset
890 vo_dheight + vo_panscan_y - 1);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
891 flip_page();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
892 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
893 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
894 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
895 case VOCTRL_SET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
896 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
897 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
898 int value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
899
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
900 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
901 value = va_arg(ap, int);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
902
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
903 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
904
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
905 return (vo_xv_set_eq(xv_port, data, value));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
906 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
907 case VOCTRL_GET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
908 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
909 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
910 int *value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
911
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
912 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
913 value = va_arg(ap, int *);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
914
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
915 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
916
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
917 return (vo_xv_get_eq(xv_port, data, value));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
918 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
919 case VOCTRL_ONTOP:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
920 vo_x11_ontop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
921 return VO_TRUE;
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22130
diff changeset
922 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22130
diff changeset
923 update_xinerama_info();
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 22130
diff changeset
924 return VO_TRUE;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
925 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
926 return VO_NOTIMPL;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
927 }