Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 2031:624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
Removed X11_FULLSCREEN hack from mplayer.c and moved it to libvo/vo_xv.c.
Added support for nominator[:/]denominator float values in cfg-parser, thanks for the code by Steve Davies.
All around thanks to Steve for helping me understanding the whole stuff :)
author | atmos4 |
---|---|
date | Mon, 01 Oct 2001 15:58:31 +0000 |
parents | 6185fef2703a |
children | a74a82334f60 |
rev | line source |
---|---|
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
1 |
1265 | 2 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
3 // Use option -double to enable double buffering! (default: single buffer) | |
4 #define NUM_BUFFERS 2 | |
1 | 5 |
182 | 6 /* |
7 * vo_xv.c, X11 Xv interface | |
1 | 8 * |
182 | 9 * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. |
1 | 10 * |
11 * Hacked into mpeg2dec by | |
182 | 12 * |
1 | 13 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> |
14 * | |
15 * Xv image suuport by Gerd Knorr <kraxel@goldbach.in-berlin.de> | |
1265 | 16 * fullscreen support by Pontscho |
17 * double buffering support by A'rpi | |
1 | 18 */ |
19 | |
20 #include <stdio.h> | |
21 #include <stdlib.h> | |
22 #include <string.h> | |
23 | |
24 #include "config.h" | |
25 #include "video_out.h" | |
26 #include "video_out_internal.h" | |
27 | |
28 LIBVO_EXTERN(xv) | |
29 | |
30 #include <X11/Xlib.h> | |
31 #include <X11/Xutil.h> | |
32 #include <X11/extensions/XShm.h> | |
33 #include <errno.h> | |
34 | |
31 | 35 #include "x11_common.h" |
36 | |
354 | 37 #include "fastmemcpy.h" |
616 | 38 #include "sub.h" |
350 | 39 |
182 | 40 static vo_info_t vo_info = |
1 | 41 { |
182 | 42 "X11/Xv", |
43 "xv", | |
44 "Gerd Knorr <kraxel@goldbach.in-berlin.de>", | |
45 "" | |
1 | 46 }; |
47 | |
48 /* since it doesn't seem to be defined on some platforms */ | |
49 int XShmGetEventBase(Display*); | |
50 | |
51 /* local data */ | |
52 static unsigned char *ImageData; | |
53 | |
54 /* X11 related variables */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
55 //static Display *mydisplay; |
1 | 56 static Window mywindow; |
57 static GC mygc; | |
58 static XImage *myximage; | |
59 static int depth, bpp, mode; | |
60 static XWindowAttributes attribs; | |
61 | |
62 #include <X11/extensions/Xv.h> | |
63 #include <X11/extensions/Xvlib.h> | |
64 // FIXME: dynamically allocate this stuff | |
65 static void allocate_xvimage(int); | |
66 static unsigned int ver,rel,req,ev,err; | |
67 static unsigned int formats, adaptors,i,xv_port,xv_format; | |
68 static XvAdaptorInfo *ai; | |
69 static XvImageFormatValues *fo; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
70 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
71 static int current_buf=0; |
1265 | 72 static int num_buffers=1; // default |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
73 static XvImage* xvimage[NUM_BUFFERS]; |
1 | 74 |
75 #include <sys/ipc.h> | |
76 #include <sys/shm.h> | |
77 #include <X11/extensions/XShm.h> | |
78 | |
79 static int Shmem_Flag; | |
80 static int Quiet_Flag; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
81 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; |
1 | 82 static int gXErrorFlag; |
83 static int CompletionType = -1; | |
84 | |
85 static uint32_t image_width; | |
86 static uint32_t image_height; | |
87 static uint32_t image_format; | |
88 | |
182 | 89 static Window mRoot; |
90 static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; | |
91 static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen; | |
1 | 92 |
1775 | 93 #ifdef HAVE_NEW_GUI |
723 | 94 static uint32_t mdwidth,mdheight; |
95 #endif | |
96 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
97 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
98 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
|
99 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
100 static void draw_alpha_yv12(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
|
101 vo_draw_alpha_yv12(w,h,src,srca,stride,xvimage[current_buf]->data+image_width*y0+x0,image_width); |
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_yuy2(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
|
105 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0),2*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
106 } |
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 static void draw_alpha_uyvy(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
|
109 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0)+1,2*image_width); |
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 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
112 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
|
113 } |
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 |
182 | 116 /* |
117 * connect to server, create and map window, | |
1 | 118 * allocate colors and (shared) memory |
119 */ | |
844 | 120 static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 121 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
122 // int screen; |
182 | 123 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
|
124 // char *name = ":0.0"; |
182 | 125 XSizeHints hint; |
126 XVisualInfo vinfo; | |
127 XEvent xev; | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
128 XvPortID xv_p; |
1 | 129 |
182 | 130 XGCValues xgcv; |
131 XSetWindowAttributes xswa; | |
132 unsigned long xswamask; | |
1 | 133 |
182 | 134 image_height = height; |
135 image_width = width; | |
136 image_format=format; | |
1 | 137 |
1775 | 138 #ifdef HAVE_NEW_GUI |
139 mdwidth=width; | |
140 mdheight=height; | |
141 #endif | |
142 | |
844 | 143 mFullscreen=flags&1; |
182 | 144 dwidth=d_width; dheight=d_height; |
1265 | 145 num_buffers=vo_doublebuffering?NUM_BUFFERS: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
|
146 |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
147 if (!vo_init()) return -1; |
1 | 148 |
1775 | 149 #ifdef HAVE_NEW_GUI |
723 | 150 if ( vo_window == None ) |
182 | 151 { |
723 | 152 #endif |
153 hint.x = 0; | |
154 hint.y = 0; | |
155 hint.width = d_width; | |
156 hint.height = d_height; | |
844 | 157 if ( mFullscreen ) |
723 | 158 { |
159 hint.width=vo_screenwidth; | |
160 hint.height=vo_screenheight; | |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
161 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
162 * with libvo2 this should be unified among vo plugins |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
163 * 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
|
164 * 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
|
165 * 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
|
166 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
167 |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
168 #ifdef X11_FULLSCREEN |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
169 d_height=(int)((float)vo_screenwidth/(float)dwidth*(float)dheight); |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
170 d_height+=d_height%2; // round |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
171 d_width=vo_screenwidth; |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
172 if(dheight>vo_screenheight){ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
173 d_width=(int)((float)vo_screenheight/(float)dheight*(float)dwidth); |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
174 d_width+=d_width%2; // round |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
175 d_height=vo_screenheight; |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
176 } |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
177 dwidth=d_width; dheight=d_height; |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
178 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
179 |
723 | 180 } |
181 hint.flags = PPosition | PSize; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
182 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 183 depth=attribs.depth; |
184 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
|
185 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 186 |
187 xswa.background_pixel = 0; | |
188 xswa.border_pixel = 0; | |
189 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 190 |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
191 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), |
723 | 192 hint.x, hint.y, hint.width, hint.height, |
193 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
922
diff
changeset
|
194 vo_x11_classhint( mDisplay,mywindow,"xv" ); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
195 vo_hidecursor(mDisplay,mywindow); |
1 | 196 |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
197 XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask ); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
198 XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
199 if ( mFullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
200 XMapWindow(mDisplay, mywindow); |
1775 | 201 mygc = XCreateGC(mDisplay, mywindow, 0L, &xgcv); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
202 XFlush(mDisplay); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
203 XSync(mDisplay, False); |
1775 | 204 #ifdef HAVE_NEW_GUI |
723 | 205 } |
206 else | |
207 { | |
208 mywindow=vo_window; | |
209 mygc=vo_gc; | |
210 } | |
211 #endif | |
1 | 212 |
182 | 213 xv_port = 0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
214 if (Success == XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)) |
182 | 215 { |
216 /* check for Xvideo support */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
217 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)) |
182 | 218 { |
614 | 219 printf("Xv: XvQueryAdaptors failed"); |
182 | 220 return -1; |
221 } | |
222 /* check adaptors */ | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
223 for (i = 0; i < adaptors && xv_port == 0; i++) |
182 | 224 { |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
225 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
226 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p) |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
227 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
228 xv_port = xv_p; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
229 break; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
230 } else { |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
231 printf("Xv: could not grab port %i\n", (int)xv_p); |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
232 } |
182 | 233 } |
234 /* check image formats */ | |
235 if (xv_port != 0) | |
236 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
237 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
182 | 238 xv_format=0; |
239 for(i = 0; i < formats; i++) | |
240 { | |
614 | 241 printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
1 | 242 |
182 | 243 if (fo[i].id == format) |
244 { | |
245 xv_format = fo[i].id; | |
246 } | |
247 } | |
248 if (!xv_format) xv_port = 0; | |
249 } | |
250 | |
251 if (xv_port != 0) | |
252 { | |
614 | 253 printf( "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
|
254 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
255 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
256 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
257 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
258 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
|
259 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
260 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
|
261 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
|
262 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
|
263 } |
182 | 264 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
265 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
|
266 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
267 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
268 current_buf=0; |
1 | 269 |
1818 | 270 #ifdef HAVE_NEW_GUI |
271 if ( vo_window != None ) | |
272 { | |
273 mFullscreen=0; | |
274 dwidth=mdwidth; dheight=mdheight; | |
275 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) | |
276 { | |
277 mFullscreen=1; | |
278 dwidth=vo_screenwidth; | |
279 dheight=vo_screenwidth * mdheight / mdwidth; | |
280 } | |
281 } | |
282 #endif | |
283 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
284 XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 285 drwX=0; drwY=0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
286 XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 287 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 288 |
182 | 289 if ( mFullscreen ) |
290 { | |
291 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; | |
292 drwcX+=drwX; | |
293 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
294 drwcY+=drwY; | |
295 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); | |
296 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
614 | 297 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 298 } |
1794 | 299 #ifdef HAVE_NEW_GUI |
300 if ( vo_window == None ) | |
301 #endif | |
1818 | 302 saver_off(mDisplay); // turning off screen saver |
182 | 303 return 0; |
304 } | |
305 } | |
1 | 306 |
182 | 307 printf("Sorry, Xv not supported by this X11 version/driver\n"); |
308 printf("******** Try with -vo x11 or -vo sdl *********\n"); | |
309 return 1; | |
1 | 310 } |
311 | |
182 | 312 static const vo_info_t * get_info(void) |
313 { return &vo_info; } | |
1 | 314 |
182 | 315 static void allocate_xvimage(int foo) |
1 | 316 { |
182 | 317 /* |
318 * allocate XvImages. FIXME: no error checking, without | |
319 * mit-shm this will bomb... | |
320 */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
321 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 322 |
182 | 323 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); |
324 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
325 Shminfo[foo].readOnly = False; | |
1 | 326 |
182 | 327 xvimage[foo]->data = Shminfo[foo].shmaddr; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
328 XShmAttach(mDisplay, &Shminfo[foo]); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
329 XSync(mDisplay, False); |
182 | 330 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); |
331 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); | |
332 return; | |
1 | 333 } |
334 | |
1794 | 335 static void deallocate_xvimage(int foo) |
336 { | |
337 XShmDetach( mDisplay,&Shminfo[foo] ); | |
338 shmdt( Shminfo[foo].shmaddr ); | |
339 XFlush( mDisplay ); | |
340 XSync(mDisplay, False); | |
341 return; | |
342 } | |
343 | |
31 | 344 static void check_events(void) |
1 | 345 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
346 int e=vo_x11_check_events(mDisplay); |
182 | 347 if(e&VO_EVENT_RESIZE) |
348 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
349 XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 350 drwX=0; drwY=0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
351 XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 352 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 353 |
1775 | 354 #ifdef HAVE_NEW_GUI |
723 | 355 if ( vo_window != None ) |
356 { | |
357 mFullscreen=0; | |
358 dwidth=mdwidth; dheight=mdheight; | |
1818 | 359 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) |
723 | 360 { |
361 mFullscreen=1; | |
362 dwidth=vo_screenwidth; | |
363 dheight=vo_screenwidth * mdheight / mdwidth; | |
364 } | |
365 } | |
366 #endif | |
367 | |
182 | 368 if ( mFullscreen ) |
369 { | |
370 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; | |
371 drwcX+=drwX; | |
372 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
373 drwcY+=drwY; | |
374 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); | |
375 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
614 | 376 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 377 } |
378 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
379 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
380 { |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
381 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
382 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), False); |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
383 } |
1 | 384 } |
385 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
386 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
387 { vo_draw_text(image_width,image_height,draw_alpha_fnc);} |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
388 |
182 | 389 static void flip_page(void) |
1 | 390 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
391 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], |
182 | 392 0, 0, image_width, image_height, |
393 drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), | |
394 False); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
395 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
396 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
397 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
398 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
399 XSync(mDisplay, False); |
182 | 400 return; |
1 | 401 } |
402 | |
247 | 403 |
404 | |
182 | 405 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 406 { |
182 | 407 uint8_t *src; |
408 uint8_t *dst; | |
409 int i; | |
410 | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
411 dst = xvimage[current_buf]->data + image_width * y + x; |
182 | 412 src = image[0]; |
413 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); | |
414 else | |
415 for(i=0;i<h;i++) | |
416 { | |
417 memcpy(dst,src,w); | |
418 src+=stride[0]; | |
419 dst+=image_width; | |
420 } | |
421 | |
422 x/=2;y/=2;w/=2;h/=2; | |
1 | 423 |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
424 dst = xvimage[current_buf]->data + image_width * image_height + image_width/2 * y + x; |
182 | 425 src = image[2]; |
426 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); | |
427 else | |
428 for(i=0;i<h;i++) | |
429 { | |
430 memcpy(dst,src,w); | |
431 src+=stride[2]; | |
432 dst+=image_width/2; | |
433 } | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
434 dst = xvimage[current_buf]->data + image_width * image_height * 5 / 4 + image_width/2 * y + x; |
182 | 435 src = image[1]; |
436 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); | |
437 else | |
438 for(i=0;i<h;i++) | |
439 { | |
440 memcpy(dst,src,w); | |
441 src+=stride[1]; | |
442 dst+=image_width/2; | |
443 } | |
444 return 0; | |
1 | 445 } |
446 | |
182 | 447 static uint32_t draw_frame(uint8_t *src[]) |
1 | 448 { |
182 | 449 int foo; |
1 | 450 |
408 | 451 switch (xv_format) { |
452 case IMGFMT_YUY2: | |
453 case IMGFMT_UYVY: | |
454 case IMGFMT_YVYU: | |
455 | |
456 // YUY2 packed, flipped | |
1 | 457 #if 0 |
408 | 458 int i; |
459 unsigned short *s=(unsigned short *)src[0]; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
460 unsigned short *d=(unsigned short *)xvimage[current_buf]->data; |
408 | 461 s+=image_width*image_height; |
462 for(i=0;i<image_height;i++) { | |
463 s-=image_width; | |
464 memcpy(d,s,image_width*2); | |
465 d+=image_width; | |
466 } | |
1 | 467 #else |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
468 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); |
1 | 469 #endif |
408 | 470 break; |
471 | |
472 case IMGFMT_YV12: | |
473 case IMGFMT_I420: | |
474 case IMGFMT_IYUV: | |
475 | |
182 | 476 // YV12 planar |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
477 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
478 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
479 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); |
408 | 480 break; |
481 } | |
182 | 482 |
483 return 0; | |
1 | 484 } |
485 | |
182 | 486 static uint32_t query_format(uint32_t format) |
1 | 487 { |
408 | 488 |
489 // umm, this is a kludge, we need to ask the server.. (see init function above) | |
490 return 1; | |
491 /* | |
182 | 492 switch(format) |
493 { | |
494 case IMGFMT_YV12: | |
408 | 495 case IMGFMT_YUY2: |
496 return 1; | |
182 | 497 } |
498 return 0; | |
408 | 499 */ |
1 | 500 } |
501 | |
1852 | 502 static void uninit(void) |
503 { | |
504 int i; | |
1794 | 505 #ifdef HAVE_NEW_GUI |
1852 | 506 if ( vo_window == None ) |
1794 | 507 #endif |
1924 | 508 { |
1852 | 509 saver_on(mDisplay); // screen saver back on |
1924 | 510 XDestroyWindow( mDisplay,mywindow ); |
511 } | |
1852 | 512 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
513 } |
1 | 514 |
515 | |
516 |