annotate libvo/vo_xv.c @ 10898:716edc005b18

patch from Pierre Lombard <p_l@gmx.fr> If the sound channel is already busy the async open fails and returns -EBUSY. There's no need to try to open it synchronously as it will block mplayer till the sound channel is released. (Granted there's a very slight chance your sound device happen to be freed between those two calls but it's not the common case). The behavior is changed by this oneliner to match the ao_oss behavior (disable sound if the sound device is busy).
author attila
date Sun, 21 Sep 2003 09:49:05 +0000
parents eeae5c1b8fff
children 604a27a2b966
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"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
33 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
34
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
35 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
36 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
37 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
38
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
39 #ifdef HAVE_NEW_GUI
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
40 #include "../Gui/interface.h"
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
41 #endif
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
42
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
43 static vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
45 "X11/Xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
46 "xv",
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
47 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
48 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
51 LIBVO_EXTERN(xv)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
52
6719
5291d74a60c9 xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents: 6417
diff changeset
53 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57
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 */
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
59 int XShmGetEventBase(Display*);
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);
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
71 static unsigned int ver,rel,req,ev,err;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
72 static unsigned int formats, adaptors, xv_port, xv_format;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
73 static XvAdaptorInfo *ai = NULL;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
74 static XvImageFormatValues *fo;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
75
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
76 static int current_buf=0;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
77 static int current_ip_buf=0;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
78 static int num_buffers=1; // default
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
79 static XvImage* xvimage[NUM_BUFFERS];
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
80
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
81
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static uint32_t image_format;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
85 static int flip_flag;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
87 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
88
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
89 static Window mRoot;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
90 static uint32_t drwX,drwY,drwBorderWidth,drwDepth;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
91 static uint32_t dwidth,dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
93 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
94
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
95 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
8793
63e2ab74e0a6 fixed calculation of OSD coordinates w/ panscan
henry
parents: 8745
diff changeset
96 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
97 vo_draw_alpha_yv12(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
98 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
99 xvimage[current_buf]->pitches[0]*y0+x0,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
100 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
101
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
102 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
8793
63e2ab74e0a6 fixed calculation of OSD coordinates w/ panscan
henry
parents: 8745
diff changeset
103 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
104 vo_draw_alpha_yuy2(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
105 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
106 xvimage[current_buf]->pitches[0]*y0+2*x0,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
107 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
108
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
109 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
8793
63e2ab74e0a6 fixed calculation of OSD coordinates w/ panscan
henry
parents: 8745
diff changeset
110 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
111 vo_draw_alpha_yuy2(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
112 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
113 xvimage[current_buf]->pitches[0]*y0+2*x0+1,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
114 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
115
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
116 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
117 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
118
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
119
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
120 static void deallocate_xvimage(int foo);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
121
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
122 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
123 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 */
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
126 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
128 // int screen;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
129 char *hello = (title == NULL) ? "Xv render" : title;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
130 // char *name = ":0.0";
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
131 XSizeHints hint;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
132 XVisualInfo vinfo;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
133 XGCValues xgcv;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
134 XSetWindowAttributes xswa;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7124
diff changeset
135 XWindowAttributes attribs;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
136 unsigned long xswamask;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7124
diff changeset
137 int depth;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
138 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
139 int vm=0;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
140 unsigned int modeline_width, modeline_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
141 static uint32_t vm_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
142 static uint32_t vm_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
143 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
145 panscan_init();
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
146
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
147 aspect_save_orig(width,height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
148 aspect_save_prescale(d_width,d_height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
149
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
150 image_height = height;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
151 image_width = width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
152 image_format=format;
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
153
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
154 vo_mouse_autohide=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
156 int_pause=0;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
157
8743
68a0f5e77257 10l, geometry always returns 1. i think this is the correct fix.
rfelker
parents: 8738
diff changeset
158 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
9517
d65ddafbc404 clean up of -geometry code.
attila
parents: 9381
diff changeset
159 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
160 vo_dwidth=d_width; vo_dheight=d_height;
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
161
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
162 #ifdef HAVE_XF86VM
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
163 if( flags&0x02 ) vm = 1;
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
164 #endif
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
165 flip_flag=flags&8;
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
166 num_buffers=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
167
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
168 /* check image formats */
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
169 {
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
170 unsigned int i;
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
171
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
172 xv_format=0;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
173 for(i = 0; i < formats; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
174 mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
175 if (fo[i].id == format) xv_format = fo[i].id;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
176 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
177 if (!xv_format) return -1;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
178 }
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 aspect_save_screenres(vo_screenwidth,vo_screenheight);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
180
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
181 #ifdef HAVE_NEW_GUI
5985
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
182 if(use_gui)
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
183 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
184 else
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
185 #endif
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
186 {
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
187 hint.x = vo_dx;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
188 hint.y = vo_dy;
10323
48a7bc316e45 Patch by Tom Lees <tal26 (at) cam.ac.uk>
attila
parents: 10286
diff changeset
189 aspect(&d_width,&d_height,A_NOZOOM);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
190 hint.width = d_width;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
191 hint.height = d_height;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
192 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
193 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
194 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
195 if ((d_width==0) && (d_height==0))
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
196 { vm_width=image_width; vm_height=image_height; }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
197 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
198 { vm_width=d_width; vm_height=d_height; }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
199 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height);
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
200 hint.x=(vo_screenwidth-modeline_width)/2;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
201 hint.y=(vo_screenheight-modeline_height)/2;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
202 hint.width=modeline_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
203 hint.height=modeline_height;
6125
018a0d7dddd4 -vm -fs fix by Tobias Diedrich <ranma@gmx.at>
arpi
parents: 6095
diff changeset
204 aspect_save_screenres(modeline_width,modeline_height);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
205 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
206 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
207 #endif
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
208 if ( vo_fs )
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
209 {
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
210 #ifdef X11_FULLSCREEN
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
211 /* this code replaces X11_FULLSCREEN hack in mplayer.c
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
212 * aspect() is available through aspect.h for all vos.
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
213 * besides zooming should only be done with -zoom,
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
214 * but I leave the old -fs behaviour so users don't get
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
215 * irritated for now (and send lots o' mails ;) ::atmos
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
216 */
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
217
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
218 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
219 #endif
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
220
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
221 }
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
222 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for?
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
223 vo_dwidth=d_width; vo_dheight=d_height;
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
224 hint.flags = PPosition | PSize /* | PBaseSize */;
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
225 hint.base_width = hint.width; hint.base_height = hint.height;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
226 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
227 depth=attribs.depth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
228 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
229 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
230
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
231 xswa.background_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
232 xswa.border_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
233 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
235 if ( WinID>=0 ){
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
236 vo_window = WinID ? ((Window)WinID) : mRootWin;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
237 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
238 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
239 XUnmapWindow( mDisplay,vo_window );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
240 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6793
diff changeset
241 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
6366
287c2e661172 -wid fix by "Markus J.R." <random@shell.dnload.com>
atmos4
parents: 6332
diff changeset
242 XMapWindow( mDisplay,vo_window );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
243 } else { drwX=vo_dx; drwY=vo_dy; }
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
244 } else
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
245 if ( vo_window == None ){
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
246 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo.visual, hint.x, hint.y, hint.width, hint.height, depth, CopyFromParent);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
247
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
248 vo_x11_classhint( mDisplay,vo_window,"xv" );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
249 vo_hidecursor(mDisplay,vo_window);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
250
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6793
diff changeset
251 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask |
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5821
diff changeset
252 ((WinID==0) ? 0 : (PointerMotionMask
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
253 | ButtonPressMask | ButtonReleaseMask | ExposureMask
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
254 )));
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
255 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
256 XSetWMNormalHints( mDisplay,vo_window,&hint );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
257 XMapWindow(mDisplay, vo_window);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
258 if ( flags&1 ) vo_x11_fullscreen();
10323
48a7bc316e45 Patch by Tom Lees <tal26 (at) cam.ac.uk>
attila
parents: 10286
diff changeset
259 else {
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
260 #ifdef HAVE_XINERAMA
10323
48a7bc316e45 Patch by Tom Lees <tal26 (at) cam.ac.uk>
attila
parents: 10286
diff changeset
261 vo_x11_xinerama_move(mDisplay,vo_window);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
262 #endif
10323
48a7bc316e45 Patch by Tom Lees <tal26 (at) cam.ac.uk>
attila
parents: 10286
diff changeset
263 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
48a7bc316e45 Patch by Tom Lees <tal26 (at) cam.ac.uk>
attila
parents: 10286
diff changeset
264 }
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
265 } else {
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
266 // vo_fs set means we were already at fullscreen
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
267 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
268 if ( !vo_fs ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
269 if ( flags&1 && !vo_fs ) vo_x11_fullscreen(); // handle -fs on non-first file
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
270 }
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
271
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
272 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
273
7765
dbf1e5cfadbd fix memleak
pontscho
parents: 7758
diff changeset
274 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
275 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
276 XFlush(mDisplay);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
277 XSync(mDisplay, False);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
278 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
279 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
280 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
281 /* Grab the mouse pointer in our window */
7539
56ea9db91251 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents: 7526
diff changeset
282 if(vo_grabpointer)
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
283 XGrabPointer(mDisplay, vo_window, True, 0,
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
284 GrabModeAsync, GrabModeAsync,
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
285 vo_window, None, CurrentTime);
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
286 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
287 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
288 #endif
5985
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
289 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
291 mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port );
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
292
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
293 switch (xv_format){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
294 case IMGFMT_YV12:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
295 case IMGFMT_I420:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
296 case IMGFMT_IYUV: draw_alpha_fnc=draw_alpha_yv12; break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
297 case IMGFMT_YUY2:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
298 case IMGFMT_YVYU: draw_alpha_fnc=draw_alpha_yuy2; break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
299 case IMGFMT_UYVY: draw_alpha_fnc=draw_alpha_uyvy; break;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
300 default: draw_alpha_fnc=draw_alpha_null;
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
301 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
302
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
303 if ( vo_config_count )
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
304 for(current_buf=0;current_buf<num_buffers;++current_buf)
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
305 deallocate_xvimage(current_buf);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
306
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
307 for(current_buf=0;current_buf<num_buffers;++current_buf)
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
308 allocate_xvimage(current_buf);
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
309
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
310 current_buf=0;
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
311 current_ip_buf=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
313 #if 0
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
314 set_gamma_correction();
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
315 #endif
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
316
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
317 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
318 if ( (( flags&1 )&&( WinID <= 0 )) || vo_fs )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
319 {
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
320 aspect(&vo_dwidth,&vo_dheight,A_ZOOM);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
321 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
322 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
323 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
324 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
325 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
326 }
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
327
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
328 panscan_calc();
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
329
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
330 XClearWindow(mDisplay, vo_window);
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
331 #if 0
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
332 #ifdef HAVE_SHM
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
333 if ( Shmem_Flag )
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
334 {
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
335 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False);
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
336 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), False);
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
337 }
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
338 else
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
339 #endif
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
340 {
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
341 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1);
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
342 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight));
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
343 }
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
344 #endif
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
345
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
346 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
347
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4307
diff changeset
348 saver_off(mDisplay); // turning off screen saver
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
349 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
351
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
352 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
354 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
355 * allocate XvImages. FIXME: no error checking, without
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
356 * mit-shm this will bomb... trzing to fix ::atmos
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
357 */
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
358 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
359 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1;
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
360 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
361 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
362 Shmem_Flag = 0;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
363 mp_msg(MSGT_VO,MSGL_INFO, "Shared memory not supported\nReverting to normal Xv\n" );
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
364 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
365 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
366 {
7848
3c1d30a1afc0 compiler warning fixes by Dominik
arpi
parents: 7766
diff changeset
367 xvimage[foo] = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
369 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
370 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
371 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
373 xvimage[foo]->data = Shminfo[foo].shmaddr;
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
374 XShmAttach(mDisplay, &Shminfo[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
375 XSync(mDisplay, False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
376 shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
377 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
378 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
379 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
380 {
7848
3c1d30a1afc0 compiler warning fixes by Dominik
arpi
parents: 7766
diff changeset
381 xvimage[foo] = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
382 xvimage[foo]->data = malloc(xvimage[foo]->data_size);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
383 XSync(mDisplay,False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
384 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
385 memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
386 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
389 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
390 {
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
391 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
392 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
393 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
394 XShmDetach( mDisplay,&Shminfo[foo] );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
395 shmdt( Shminfo[foo].shmaddr );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
396 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
397 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
398 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
399 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
400 free(xvimage[foo]->data);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
401 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
402 XFree(xvimage[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
403
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
404 XFlush( mDisplay );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
405 XSync(mDisplay, False);
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
406 return;
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
407 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
408
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
409 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
410 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
411 int e=vo_x11_check_events(mDisplay);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
412
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
413 if (e&VO_EVENT_EXPOSE && vo_fs)
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
414 vo_x11_clearwindow(mDisplay, vo_window);
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
415
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
416 if(e&VO_EVENT_RESIZE)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
417 {
7056
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
418 if (vo_fs) {
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
419 e |= VO_EVENT_EXPOSE;
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
420 XClearWindow(mDisplay, vo_window);
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
421 XFlush(mDisplay);
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
422 }
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
423
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
424 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth );
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
425 drwX = drwY = 0;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
426 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
427
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
428 aspect(&dwidth,&dheight,A_NOZOOM);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
429 if ( vo_fs )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
430 {
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
431 aspect(&dwidth,&dheight,A_ZOOM);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
432 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
433 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
434 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
435 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
436 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
437 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
438 }
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
439
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
440 if ( (e&VO_EVENT_EXPOSE || e&VO_EVENT_RESIZE) && 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
441 flip_page();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
442 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
443
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
444 static void draw_osd(void)
8793
63e2ab74e0a6 fixed calculation of OSD coordinates w/ panscan
henry
parents: 8745
diff changeset
445 { vo_draw_text(image_width-image_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),image_height,draw_alpha_fnc);}
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
446
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
447 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448 {
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
449
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
450 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
451 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
452 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
453 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
454 0, 0, image_width, image_height,
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
455 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y,
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
456 False);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
457 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
458 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
459 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
460 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
461 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
462 0, 0, image_width, image_height,
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
463 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
464 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
465 if (num_buffers>1){
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
466 current_buf=vo_directrendering?0:((current_buf+1)%num_buffers);
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
467 XFlush(mDisplay);
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
468 } else
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
469 XSync(mDisplay, False);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
470 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
471 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
472
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
473 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
474 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
475 uint8_t *dst;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
476
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
477 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
478 xvimage[current_buf]->pitches[0]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
479 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
480
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
481 x/=2;y/=2;w/=2;h/=2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
482
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
483 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
484 xvimage[current_buf]->pitches[1]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
485 if(image_format!=IMGFMT_YV12)
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
486 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
487 else
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
488 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]);
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
489
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
490 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
491 xvimage[current_buf]->pitches[2]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
492 if(image_format==IMGFMT_YV12)
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
493 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
494 else
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
495 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]);
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
496
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
497 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
498 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
499
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
500 static uint32_t draw_frame(uint8_t *src[]){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
501 printf("draw_frame() called!!!!!!");
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
502 return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
503 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
504
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
505 static uint32_t draw_image(mp_image_t *mpi){
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
506 if(mpi->flags&MP_IMGFLAG_DIRECT){
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
507 // direct rendering:
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
508 current_buf=(int)(mpi->priv); // hack!
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
509 return VO_TRUE;
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
510 }
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
511 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) return VO_TRUE; // done
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
512 if(mpi->flags&MP_IMGFLAG_PLANAR){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
513 draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,0,0);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
514 return VO_TRUE;
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
515 }
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
516 if(mpi->flags&MP_IMGFLAG_YUV){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
517 // packed YUV:
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
518 memcpy_pic(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
519 mpi->planes[0],mpi->w*(mpi->bpp/8),mpi->h,
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
520 xvimage[current_buf]->pitches[0], mpi->stride[0]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
521 return VO_TRUE;
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
522 }
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
523 return VO_FALSE; // not (yet) supported
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
524 }
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
525
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
526 static uint32_t get_image(mp_image_t *mpi){
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
527 int buf=current_buf; // we shouldn't change current_buf unless we do DR!
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
528 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static
10113
443ac419f3a4 removed RGB24 and builtin swscaler support
alex
parents: 9981
diff changeset
529 if(mpi->imgfmt!=image_format) return VO_FALSE; // needs conversion :(
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
530 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
531 if(mpi->flags&MP_IMGFLAG_READABLE &&
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
532 (mpi->type==MP_IMGTYPE_IPB || mpi->type==MP_IMGTYPE_IP)){
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
533 // reference (I/P) frame of IP or IPB:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
534 if(num_buffers<2) return VO_FALSE; // not enough
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
535 current_ip_buf^=1;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
536 // for IPB with 2 buffers we can DR only one of the 2 P frames:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
537 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && current_ip_buf) return VO_FALSE;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
538 buf=current_ip_buf;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
539 if(mpi->type==MP_IMGTYPE_IPB) ++buf; // preserve space for B
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
540 }
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
541 if(mpi->height > xvimage[buf]->height) return VO_FALSE; //buffer to small
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
542 if(mpi->width*(mpi->bpp/8) > xvimage[buf]->pitches[0]) return VO_FALSE; //buffer to small
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
543 if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) ||
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
544 (mpi->width*(mpi->bpp/8)==xvimage[buf]->pitches[0]) ){
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
545 current_buf=buf;
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
546 mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
547 mpi->stride[0]=xvimage[current_buf]->pitches[0];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
548 mpi->width=mpi->stride[0]/(mpi->bpp/8);
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
549 if(mpi->flags&MP_IMGFLAG_PLANAR){
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
550 if(mpi->flags&MP_IMGFLAG_SWAPPED){
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
551 // I420
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
552 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
553 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
554 mpi->stride[1]=xvimage[current_buf]->pitches[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
555 mpi->stride[2]=xvimage[current_buf]->pitches[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
556 } else {
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
557 // YV12
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
558 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
559 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
560 mpi->stride[1]=xvimage[current_buf]->pitches[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
561 mpi->stride[2]=xvimage[current_buf]->pitches[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
562 }
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
563 }
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
564 mpi->flags|=MP_IMGFLAG_DIRECT;
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
565 mpi->priv=(void*)current_buf;
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
566 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
567 return VO_TRUE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
568 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
569 return VO_FALSE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
570 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
571
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
572 static uint32_t query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
573 {
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
574 uint32_t i;
9027
e59cda3414b6 conformation with api
alex
parents: 8793
diff changeset
575 int flag=VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|
e59cda3414b6 conformation with api
alex
parents: 8793
diff changeset
576 VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
577 /* check image formats */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
578 for(i = 0; i < formats; i++){
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
579 if (fo[i].id == format) return flag; //xv_format = fo[i].id;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
580 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
581 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
582 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
583
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
584 static void uninit(void)
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
585 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
586 int i;
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
587 if ( !vo_config_count ) return;
9981
99b58133c376 memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents: 9517
diff changeset
588 XvFreeAdaptorInfo(ai);
99b58133c376 memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents: 9517
diff changeset
589 ai = NULL;
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
590 saver_on(mDisplay); // screen saver back on
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
591 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
592 #ifdef HAVE_XF86VM
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
593 vo_vm_close(mDisplay);
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
594 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
595 vo_x11_uninit();
322
4e69a8e2700a Screensaver and monitor powersafe function is switched off when playing a
laaz
parents: 249
diff changeset
596 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
597
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
598 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
599 {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
600 XvPortID xv_p;
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
601 int busy_ports=0;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
602 unsigned int i;
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
603
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
604 xv_port = 0;
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
605
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
606 if(arg)
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
607 {
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
608 if ((strlen(arg) >= 6) && !strncmp(arg, "port=", 5))
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
609 {
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
610 xv_port = atoi(arg+5);
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
611 }
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
612 else
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
613 {
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
614 mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg);
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
615 return ENOSYS;
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
616 }
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
617 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
618 if (!vo_init()) return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
619
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
620 /* check for Xvideo extension */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
621 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
622 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n");
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
623 mp_msg(MSGT_VO,MSGL_ERR,"******** Try with -vo x11 or -vo sdl *********\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
624 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
625 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
626
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
627 /* check for Xvideo support */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
628 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
629 mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
630 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
631 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
632
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
633 /* check adaptors */
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
634 if (xv_port) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
635 int port_found;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
636
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
637 for (port_found = 0, i = 0; !port_found && i < adaptors; i++) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
638 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
639 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
640 if (xv_p == xv_port) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
641 port_found = 1;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
642 break;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
643 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
644 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
645 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
646 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
647 if (port_found) {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
648 if (XvGrabPort(mDisplay, xv_port, CurrentTime))
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
649 xv_port = 0;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
650 } else {
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
651 mp_msg(MSGT_VO, MSGL_WARN,"Xv: Invalid port parameter, overriding with port 0\n");
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
652 xv_port = 0;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
653 }
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
654 }
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
655
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
656 for (i = 0; i < adaptors && xv_port == 0; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
657 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
658 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p)
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
659 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) {
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
660 xv_port = xv_p;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
661 break;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
662 } else {
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
663 mp_msg(MSGT_VO,MSGL_WARN,"Xv: could not grab port %i\n", (int)xv_p);
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
664 ++busy_ports;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
665 }
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
666 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
667 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
668 if(!xv_port){
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
669 if(busy_ports)
6249
e5031c75e940 message wording fix by Diego B.
arpi
parents: 6231
diff changeset
670 mp_msg(MSGT_VO,MSGL_ERR,"Could not find free Xvideo port - maybe another process is already using it.\n"
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
671 "Close all video applications, and try again. If that does not help,\n"
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
672 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n");
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
673 else
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
674 mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n"
10286
e89a7e9410b4 Add missing language suffix to DOCS/ path.
diego
parents: 10113
diff changeset
675 "Run 'xvinfo' to verify its Xv support and read DOCS/en/video.html#xv!\n"
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
676 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
677 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
678 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
679
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
680 {
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
681 int howmany, i;
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
682 const XvAttribute * const attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
683
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
684 for (i = 0; i < howmany && attributes; i++)
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
685 if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY"))
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
686 {
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
687 const Atom autopaint = XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
688 XvSetPortAttribute(mDisplay, xv_port, autopaint, 1);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
689 break;
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
690 }
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
691 }
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
692
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
693 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
694
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
695 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
696 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
697
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
698 static uint32_t control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
699 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
700 switch (request) {
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
701 case VOCTRL_PAUSE: return (int_pause=1);
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
702 case VOCTRL_RESUME: return (int_pause=0);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
703 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
704 return query_format(*((uint32_t*)data));
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
705 case VOCTRL_GET_IMAGE:
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
706 return get_image(data);
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
707 case VOCTRL_DRAW_IMAGE:
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
708 return draw_image(data);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
709 case VOCTRL_GUISUPPORT:
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
710 return VO_TRUE;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
711 case VOCTRL_GET_PANSCAN:
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
712 if ( !vo_config_count || !vo_fs ) return VO_FALSE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
713 return VO_TRUE;
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
714 case VOCTRL_FULLSCREEN:
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
715 vo_x11_fullscreen();
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
716 /* indended, fallthrough to update panscan on fullscreen/windowed switch */
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
717 case VOCTRL_SET_PANSCAN:
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
718 if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) )
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
719 {
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
720 int old_y = vo_panscan_y;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
721 panscan_calc();
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
722
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
723 if(old_y != vo_panscan_y)
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
724 {
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
725 vo_x11_clearwindow_part(mDisplay, vo_window, vo_dwidth+vo_panscan_x-1, vo_dheight+vo_panscan_y-1, 1);
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
726 flip_page();
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
727 }
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
728 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
729 return VO_TRUE;
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
730 case VOCTRL_SET_EQUALIZER:
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
731 {
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
732 va_list ap;
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
733 int value;
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
734
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
735 va_start(ap, data);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
736 value = va_arg(ap, int);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
737 va_end(ap);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
738
10359
772571c63d45 move xv_set_eq to x11_common
iive
parents: 10323
diff changeset
739 return(vo_xv_set_eq(xv_port, data, value));
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
740 }
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
741 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
742 {
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
743 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
744 int *value;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
745
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
746 va_start(ap, data);
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
747 value = va_arg(ap, int*);
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
748 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
749
10359
772571c63d45 move xv_set_eq to x11_common
iive
parents: 10323
diff changeset
750 return(vo_xv_get_eq(xv_port, data, value));
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
751 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
752 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
753 return VO_NOTIMPL;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
754 }