Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 10447:3eab06376d24
added a faq entry about encoding ASF files
Please check it and correct me if something is not right
author | attila |
---|---|
date | Sun, 20 Jul 2003 13:51:04 +0000 |
parents | 772571c63d45 |
children | 3aea64e0d6d9 |
rev | line source |
---|---|
7757 | 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 | 3 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
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 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 | |
23 #include "config.h" | |
5935 | 24 #include "mp_msg.h" |
1 | 25 #include "video_out.h" |
26 #include "video_out_internal.h" | |
27 | |
28 | |
29 #include <X11/Xlib.h> | |
30 #include <X11/Xutil.h> | |
31 #include <errno.h> | |
32 | |
31 | 33 #include "x11_common.h" |
34 | |
354 | 35 #include "fastmemcpy.h" |
616 | 36 #include "sub.h" |
2054 | 37 #include "aspect.h" |
350 | 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 | 44 { |
182 | 45 "X11/Xv", |
46 "xv", | |
6781 | 47 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others", |
182 | 48 "" |
1 | 49 }; |
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 |
1 | 53 #include <X11/extensions/Xv.h> |
54 #include <X11/extensions/Xvlib.h> | |
55 // FIXME: dynamically allocate this stuff | |
56 static void allocate_xvimage(int); | |
57 static unsigned int ver,rel,req,ev,err; | |
58 static unsigned int formats, adaptors,i,xv_port,xv_format; | |
9981
99b58133c376
memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9517
diff
changeset
|
59 static XvAdaptorInfo *ai = NULL; |
1 | 60 static XvImageFormatValues *fo; |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
61 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
62 static int current_buf=0; |
6758
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
63 static int current_ip_buf=0; |
1265 | 64 static int num_buffers=1; // default |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
65 static XvImage* xvimage[NUM_BUFFERS]; |
1 | 66 |
6719
5291d74a60c9
xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents:
6417
diff
changeset
|
67 #ifdef HAVE_SHM |
1 | 68 #include <sys/ipc.h> |
69 #include <sys/shm.h> | |
70 #include <X11/extensions/XShm.h> | |
71 | |
6416 | 72 /* since it doesn't seem to be defined on some platforms */ |
73 int XShmGetEventBase(Display*); | |
74 | |
75 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; | |
6417
44bca09c1edd
100l accidently removed a line too much (Shmem_Flag)
atmos4
parents:
6416
diff
changeset
|
76 static int Shmem_Flag; |
6416 | 77 #endif |
78 | |
1 | 79 static uint32_t image_width; |
80 static uint32_t image_height; | |
81 static uint32_t image_format; | |
4629 | 82 static int flip_flag; |
1 | 83 |
182 | 84 static Window mRoot; |
5945 | 85 static uint32_t drwX,drwY,drwBorderWidth,drwDepth; |
86 static uint32_t dwidth,dheight; | |
1 | 87 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
88 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
|
89 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
90 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
8793 | 91 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); |
6295 | 92 vo_draw_alpha_yv12(w,h,src,srca,stride, |
93 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
94 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
|
95 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
96 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
97 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
8793 | 98 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); |
6295 | 99 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
100 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
101 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
|
102 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
103 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
104 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
8793 | 105 x0+=image_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); |
6295 | 106 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
107 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
108 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
|
109 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
110 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
111 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
|
112 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
113 |
6786 | 114 |
7757 | 115 static void deallocate_xvimage(int foo); |
116 | |
182 | 117 /* |
118 * connect to server, create and map window, | |
1 | 119 * allocate colors and (shared) memory |
120 */ | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
121 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 | 122 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
123 // int screen; |
182 | 124 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
|
125 // char *name = ":0.0"; |
182 | 126 XSizeHints hint; |
127 XVisualInfo vinfo; | |
128 XGCValues xgcv; | |
129 XSetWindowAttributes xswa; | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7124
diff
changeset
|
130 XWindowAttributes attribs; |
182 | 131 unsigned long xswamask; |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7124
diff
changeset
|
132 int depth; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
133 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
134 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
135 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
|
136 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
137 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
138 #endif |
1 | 139 |
6307 | 140 panscan_init(); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
141 |
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
|
142 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
|
143 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
|
144 |
182 | 145 image_height = height; |
146 image_width = width; | |
147 image_format=format; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
148 |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
149 vo_mouse_autohide=1; |
1 | 150 |
8743
68a0f5e77257
10l, geometry always returns 1. i think this is the correct fix.
rfelker
parents:
8738
diff
changeset
|
151 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; |
9517 | 152 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight); |
5945 | 153 vo_dwidth=d_width; vo_dheight=d_height; |
4981 | 154 |
4978 | 155 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
156 if( flags&0x02 ) vm = 1; |
4978 | 157 #endif |
4629 | 158 flip_flag=flags&8; |
6758
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
159 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
|
160 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
161 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
162 xv_format=0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
163 for(i = 0; i < formats; i++){ |
5935 | 164 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
|
165 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
|
166 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
167 if (!xv_format) return -1; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
168 |
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
|
169 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
|
170 |
1775 | 171 #ifdef HAVE_NEW_GUI |
5985 | 172 if(use_gui) |
173 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window | |
174 else | |
175 #endif | |
182 | 176 { |
6043 | 177 hint.x = vo_dx; |
178 hint.y = vo_dy; | |
10323 | 179 aspect(&d_width,&d_height,A_NOZOOM); |
723 | 180 hint.width = d_width; |
181 hint.height = d_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
182 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
183 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
184 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
185 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
|
186 { 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
|
187 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
188 { 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
|
189 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
|
190 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
|
191 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
|
192 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
193 hint.height=modeline_height; |
6125 | 194 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
|
195 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
196 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
197 #endif |
4981 | 198 if ( vo_fs ) |
723 | 199 { |
2054 | 200 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
201 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 202 * 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
|
203 * 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
|
204 * 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
|
205 * 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
|
206 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
207 |
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
|
208 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
|
209 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
210 |
723 | 211 } |
5945 | 212 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
213 vo_dwidth=d_width; vo_dheight=d_height; | |
5981 | 214 hint.flags = PPosition | PSize /* | PBaseSize */; |
215 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
|
216 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 217 depth=attribs.depth; |
218 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
|
219 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 220 |
221 xswa.background_pixel = 0; | |
222 xswa.border_pixel = 0; | |
223 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 224 |
3830 | 225 if ( WinID>=0 ){ |
6043 | 226 vo_window = WinID ? ((Window)WinID) : mRootWin; |
227 if ( WinID ) | |
228 { | |
229 XUnmapWindow( mDisplay,vo_window ); | |
230 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6793
diff
changeset
|
231 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
|
232 XMapWindow( mDisplay,vo_window ); |
6043 | 233 } else { drwX=vo_dx; drwY=vo_dy; } |
3830 | 234 } else |
7757 | 235 if ( vo_window == None ){ |
6043 | 236 vo_window = XCreateWindow(mDisplay, mRootWin, |
237 hint.x, hint.y, hint.width, hint.height, | |
238 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
3830 | 239 |
6043 | 240 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
241 vo_hidecursor(mDisplay,vo_window); | |
3830 | 242 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6793
diff
changeset
|
243 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | |
5822 | 244 ((WinID==0) ? 0 : (PointerMotionMask |
4658 | 245 | ButtonPressMask | ButtonReleaseMask |
6043 | 246 ))); |
247 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); | |
248 XSetWMNormalHints( mDisplay,vo_window,&hint ); | |
249 XMapWindow(mDisplay, vo_window); | |
250 if ( flags&1 ) vo_x11_fullscreen(); | |
10323 | 251 else { |
3990 | 252 #ifdef HAVE_XINERAMA |
10323 | 253 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 254 #endif |
10323 | 255 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
256 } | |
9161 | 257 } else { |
258 // vo_fs set means we were already at fullscreen | |
259 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); | |
260 if ( !vo_fs ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); | |
261 if ( flags&1 && !vo_fs ) vo_x11_fullscreen(); // handle -fs on non-first file | |
262 } | |
263 | |
264 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); | |
265 | |
7765 | 266 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); |
6043 | 267 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); |
268 XFlush(mDisplay); | |
269 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
270 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
271 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
272 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
273 /* 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
|
274 if(vo_grabpointer) |
4795 | 275 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
|
276 GrabModeAsync, GrabModeAsync, |
4795 | 277 vo_window, None, CurrentTime); |
278 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
|
279 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
280 #endif |
5985 | 281 } |
1 | 282 |
5935 | 283 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
|
284 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
285 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
286 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
287 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
288 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
|
289 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
290 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
|
291 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
|
292 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
|
293 } |
182 | 294 |
7757 | 295 if ( vo_config_count ) |
296 for(current_buf=0;current_buf<num_buffers;++current_buf) | |
297 deallocate_xvimage(current_buf); | |
298 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
299 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
|
300 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
301 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
302 current_buf=0; |
6758
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
303 current_ip_buf=0; |
1 | 304 |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
305 #if 0 |
4396 | 306 set_gamma_correction(); |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
307 #endif |
1818 | 308 |
5945 | 309 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); |
9161 | 310 if ( (( flags&1 )&&( WinID <= 0 )) || vo_fs ) |
182 | 311 { |
5945 | 312 aspect(&vo_dwidth,&vo_dheight,A_ZOOM); |
313 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; | |
314 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2; | |
315 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth); | |
316 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight); | |
317 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 318 } |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
319 |
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
320 panscan_calc(); |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
321 |
9161 | 322 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
|
323 #if 0 |
9161 | 324 #ifdef HAVE_SHM |
325 if ( Shmem_Flag ) | |
326 { | |
327 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); | |
328 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); | |
329 } | |
330 else | |
331 #endif | |
332 { | |
333 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); | |
334 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)); | |
335 } | |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
336 #endif |
6043 | 337 |
5945 | 338 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
339 | |
4316 | 340 saver_off(mDisplay); // turning off screen saver |
182 | 341 return 0; |
1 | 342 } |
343 | |
182 | 344 static void allocate_xvimage(int foo) |
1 | 345 { |
182 | 346 /* |
347 * allocate XvImages. FIXME: no error checking, without | |
6416 | 348 * mit-shm this will bomb... trzing to fix ::atmos |
182 | 349 */ |
6416 | 350 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
351 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
|
352 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
353 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
354 Shmem_Flag = 0; |
5935 | 355 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
|
356 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
357 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
358 { |
7848 | 359 xvimage[foo] = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]); |
1 | 360 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
361 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
|
362 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
|
363 Shminfo[foo].readOnly = False; |
1 | 364 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
365 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
|
366 XShmAttach(mDisplay, &Shminfo[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
367 XSync(mDisplay, False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
368 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
|
369 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
370 else |
6416 | 371 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
372 { |
7848 | 373 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
|
374 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
|
375 XSync(mDisplay,False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
376 } |
182 | 377 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); |
378 return; | |
1 | 379 } |
380 | |
1794 | 381 static void deallocate_xvimage(int foo) |
382 { | |
6416 | 383 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
384 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
385 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
386 XShmDetach( mDisplay,&Shminfo[foo] ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
387 shmdt( Shminfo[foo].shmaddr ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
388 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
389 else |
6416 | 390 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
391 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
392 free(xvimage[foo]->data); |
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 XFree(xvimage[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
395 |
1794 | 396 XFlush( mDisplay ); |
397 XSync(mDisplay, False); | |
398 return; | |
399 } | |
400 | |
31 | 401 static void check_events(void) |
1 | 402 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
403 int e=vo_x11_check_events(mDisplay); |
182 | 404 if(e&VO_EVENT_RESIZE) |
405 { | |
7056
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
406 if (vo_fs) { |
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
407 e |= VO_EVENT_EXPOSE; |
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
408 XClearWindow(mDisplay, vo_window); |
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
409 XFlush(mDisplay); |
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
410 } |
ad9a06fc40f8
added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents:
6953
diff
changeset
|
411 |
5945 | 412 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth ); |
5981 | 413 drwX = drwY = 0; |
5945 | 414 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
1 | 415 |
3558 | 416 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 417 if ( vo_fs ) |
182 | 418 { |
3558 | 419 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 420 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
421 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
5945 | 422 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
423 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
424 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 425 } |
426 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
427 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
428 { |
6416 | 429 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
430 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
431 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
432 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
5945 | 433 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); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
434 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
435 else |
6416 | 436 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
437 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
438 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); |
5945 | 439 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)); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
440 } |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
441 } |
1 | 442 } |
443 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
444 static void draw_osd(void) |
8793 | 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 | 447 static void flip_page(void) |
1 | 448 { |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
449 |
6416 | 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 | 454 0, 0, image_width, image_height, |
6307 | 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 | 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 | 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 | 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 | 470 return; |
1 | 471 } |
472 | |
182 | 473 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 474 { |
182 | 475 uint8_t *dst; |
476 | |
6231 | 477 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
478 xvimage[current_buf]->pitches[0]*y + x; | |
7684 | 479 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]); |
182 | 480 |
481 x/=2;y/=2;w/=2;h/=2; | |
1 | 482 |
6231 | 483 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
484 xvimage[current_buf]->pitches[1]*y + x; | |
7684 | 485 if(image_format!=IMGFMT_YV12) |
486 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]); | |
487 else | |
488 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]); | |
5316 | 489 |
6231 | 490 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
491 xvimage[current_buf]->pitches[2]*y + x; | |
7684 | 492 if(image_format==IMGFMT_YV12) |
493 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]); | |
494 else | |
495 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]); | |
6231 | 496 |
182 | 497 return 0; |
1 | 498 } |
499 | |
7684 | 500 static uint32_t draw_frame(uint8_t *src[]){ |
501 printf("draw_frame() called!!!!!!"); | |
502 return -1; | |
1 | 503 } |
504 | |
6760 | 505 static uint32_t draw_image(mp_image_t *mpi){ |
506 if(mpi->flags&MP_IMGFLAG_DIRECT){ | |
507 // direct rendering: | |
508 current_buf=(int)(mpi->priv); // hack! | |
509 return VO_TRUE; | |
510 } | |
7684 | 511 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) return VO_TRUE; // done |
512 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
513 draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,0,0); | |
514 return VO_TRUE; | |
515 } | |
516 if(mpi->flags&MP_IMGFLAG_YUV){ | |
517 // packed YUV: | |
518 memcpy_pic(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], | |
519 mpi->planes[0],mpi->w*(mpi->bpp/8),mpi->h, | |
520 xvimage[current_buf]->pitches[0], mpi->stride[0]); | |
521 return VO_TRUE; | |
522 } | |
6760 | 523 return VO_FALSE; // not (yet) supported |
524 } | |
525 | |
4980 | 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 | 528 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static |
10113 | 529 if(mpi->imgfmt!=image_format) return VO_FALSE; // needs conversion :( |
4980 | 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 | 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 | 546 mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; |
547 mpi->stride[0]=xvimage[current_buf]->pitches[0]; | |
548 mpi->width=mpi->stride[0]/(mpi->bpp/8); | |
549 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
550 if(mpi->flags&MP_IMGFLAG_SWAPPED){ | |
551 // I420 | |
552 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
553 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; | |
554 mpi->stride[1]=xvimage[current_buf]->pitches[1]; | |
555 mpi->stride[2]=xvimage[current_buf]->pitches[2]; | |
556 } else { | |
5316 | 557 // YV12 |
6231 | 558 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; |
559 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
560 mpi->stride[1]=xvimage[current_buf]->pitches[2]; | |
561 mpi->stride[2]=xvimage[current_buf]->pitches[1]; | |
562 } | |
563 } | |
4980 | 564 mpi->flags|=MP_IMGFLAG_DIRECT; |
6760 | 565 mpi->priv=(void*)current_buf; |
4980 | 566 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); |
567 return VO_TRUE; | |
568 } | |
569 return VO_FALSE; | |
570 } | |
571 | |
182 | 572 static uint32_t query_format(uint32_t format) |
1 | 573 { |
9027 | 574 int flag=VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW| |
575 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
|
576 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
577 for(i = 0; i < formats; i++){ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
578 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
|
579 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
580 return 0; |
1 | 581 } |
582 | |
1852 | 583 static void uninit(void) |
584 { | |
585 int i; | |
6016 | 586 if ( !vo_config_count ) return; |
9981
99b58133c376
memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9517
diff
changeset
|
587 XvFreeAdaptorInfo(ai); |
99b58133c376
memleak fix by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9517
diff
changeset
|
588 ai = NULL; |
6016 | 589 saver_on(mDisplay); // screen saver back on |
590 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); | |
591 #ifdef HAVE_XF86VM | |
592 vo_vm_close(mDisplay); | |
593 #endif | |
6095 | 594 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
595 } |
1 | 596 |
4352 | 597 static uint32_t preinit(const char *arg) |
598 { | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
599 XvPortID xv_p; |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
600 int busy_ports=0; |
6016 | 601 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
602 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
|
603 { |
5935 | 604 mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
605 return ENOSYS; |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
606 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
607 if (!vo_init()) return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
608 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
609 xv_port = 0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
610 /* check for Xvideo extension */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
611 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ |
5935 | 612 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); |
613 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
|
614 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
615 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
616 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
617 /* check for Xvideo support */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
618 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ |
5935 | 619 mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
620 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
621 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
622 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
623 /* check adaptors */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
624 for (i = 0; i < adaptors && xv_port == 0; i++){ |
5935 | 625 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
|
626 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
|
627 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
628 xv_port = xv_p; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
629 break; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
630 } else { |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
631 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
|
632 ++busy_ports; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
633 } |
5935 | 634 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
635 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
636 if(!xv_port){ |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
637 if(busy_ports) |
6249 | 638 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
|
639 "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
|
640 "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
|
641 else |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
642 mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n" |
10286 | 643 "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
|
644 "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
|
645 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
646 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
647 |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
648 { |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
649 int howmany, i; |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
650 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
|
651 |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
652 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
|
653 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
|
654 { |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
655 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
|
656 XvSetPortAttribute(mDisplay, xv_port, autopaint, 1); |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
657 break; |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
658 } |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
659 } |
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
660 |
5566 | 661 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
662 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
663 return 0; |
4352 | 664 } |
1 | 665 |
4596 | 666 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
|
667 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
668 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
669 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
670 return query_format(*((uint32_t*)data)); |
4980 | 671 case VOCTRL_GET_IMAGE: |
672 return get_image(data); | |
6760 | 673 case VOCTRL_DRAW_IMAGE: |
674 return draw_image(data); | |
6307 | 675 case VOCTRL_GUISUPPORT: |
676 return VO_TRUE; | |
677 case VOCTRL_GET_PANSCAN: | |
6311
da2dda48b7ec
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents:
6307
diff
changeset
|
678 if ( !vo_config_count || !vo_fs ) return VO_FALSE; |
6307 | 679 return VO_TRUE; |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
680 case VOCTRL_FULLSCREEN: |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
681 vo_x11_fullscreen(); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
682 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ |
6307 | 683 case VOCTRL_SET_PANSCAN: |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
684 if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) ) |
6307 | 685 { |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
686 int old_y = vo_panscan_y; |
6307 | 687 panscan_calc(); |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
688 |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
689 if(old_y != vo_panscan_y) |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
690 { |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
691 XClearWindow(mDisplay, vo_window); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
692 XFlush(mDisplay); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
693 } |
6307 | 694 } |
695 return VO_TRUE; | |
6781 | 696 case VOCTRL_SET_EQUALIZER: |
697 { | |
698 va_list ap; | |
699 int value; | |
700 | |
701 va_start(ap, data); | |
702 value = va_arg(ap, int); | |
703 va_end(ap); | |
704 | |
10359 | 705 return(vo_xv_set_eq(xv_port, data, value)); |
6781 | 706 } |
6786 | 707 case VOCTRL_GET_EQUALIZER: |
708 { | |
709 va_list ap; | |
710 int *value; | |
711 | |
712 va_start(ap, data); | |
6793 | 713 value = va_arg(ap, int*); |
6786 | 714 va_end(ap); |
715 | |
10359 | 716 return(vo_xv_get_eq(xv_port, data, value)); |
6786 | 717 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
718 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
719 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
720 } |