annotate libvo/vo_xv.c @ 21708:3275c971bbea

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