annotate libvo/vo_xv.c @ 2840:808fe0767cf8

fix typos - patch by Colin Marquardt <colin@marquardt-home.de>
author pl
date Sun, 11 Nov 2001 16:15:24 +0000
parents 48f0ac1e9d13
children 1dbf58c3d50c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
1
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
2 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
3 // Use option -double to enable double buffering! (default: single buffer)
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
4 #define NUM_BUFFERS 2
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
6 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
7 * vo_xv.c, X11 Xv interface
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
9 * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * Hacked into mpeg2dec by
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
12 *
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 * Xv image suuport by Gerd Knorr <kraxel@goldbach.in-berlin.de>
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
16 * fullscreen support by Pontscho
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
17 * double buffering support by A'rpi
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 LIBVO_EXTERN(xv)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
35 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
36
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
37 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
38 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
39 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
40
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
41 static vo_info_t vo_info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
43 "X11/Xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
44 "xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
45 "Gerd Knorr <kraxel@goldbach.in-berlin.de>",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
46 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 /* since it doesn't seem to be defined on some platforms */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 int XShmGetEventBase(Display*);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 static unsigned char *ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 /* 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
56 //static Display *mydisplay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 static Window mywindow;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 static GC mygc;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 static XImage *myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 static int depth, bpp, mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 #include <X11/extensions/Xv.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 #include <X11/extensions/Xvlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 // FIXME: dynamically allocate this stuff
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 static void allocate_xvimage(int);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 static unsigned int ver,rel,req,ev,err;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 static unsigned int formats, adaptors,i,xv_port,xv_format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 static XvAdaptorInfo *ai;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 static XvImageFormatValues *fo;
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
71
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
72 static int current_buf=0;
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
73 static int num_buffers=1; // default
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
74 static XvImage* xvimage[NUM_BUFFERS];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 static int Shmem_Flag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static int Quiet_Flag;
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
82 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static int gXErrorFlag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static int CompletionType = -1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static uint32_t image_format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
90 static Window mRoot;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
91 static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
92 static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
94 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
95 static uint32_t mdwidth,mdheight;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
96 #endif
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
97
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
98
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
99 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
100
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
101 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
102 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
103 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
104
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
105 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
106 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
107 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
108
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
109 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
110 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
111 }
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 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
114 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
115
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
116
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
117 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
118 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 */
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
121 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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
126 XSizeHints hint;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
127 XVisualInfo vinfo;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
128 XEvent xev;
1186
beb0ee0f3a25 Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents: 1137
diff changeset
129 XvPortID xv_p;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
131 XGCValues xgcv;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
132 XSetWindowAttributes xswa;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
133 unsigned long xswamask;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134
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
135 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
136 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
137
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
138 image_height = height;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
139 image_width = width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
140 image_format=format;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
142 #ifdef HAVE_NEW_GUI
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
143 mdwidth=width;
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
144 mdheight=height;
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
145 #endif
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
146
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
147 mFullscreen=flags&1;
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
148 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
149
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
150 if (!vo_init()) return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151
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
152 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
153
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
154 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
155 if ( vo_window == None )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
156 {
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
157 #endif
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
158 hint.x = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
159 hint.y = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
160 hint.width = d_width;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
161 hint.height = d_height;
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
162 aspect(&d_width,&d_height,A_NOZOOM);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
163
844
108ea5157cbc didn't handle flags parameter correctly
arpi_esp
parents: 723
diff changeset
164 if ( mFullscreen )
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
165 {
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
166 hint.width=vo_screenwidth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
167 hint.height=vo_screenheight;
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
168 #ifdef X11_FULLSCREEN
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
169 /* this code replaces X11_FULLSCREEN hack in mplayer.c
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
170 * 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
171 * 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
172 * 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
173 * 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
174 */
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
175
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
176 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
177 #endif
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
178
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
179 }
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
180 dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for?
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
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
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
183 depth=attribs.depth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
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
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
186
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
187 xswa.background_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
188 xswa.border_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
189 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
192 hint.x, hint.y, hint.width, hint.height,
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
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
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
204 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
205 }
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
206 else
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
207 {
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
208 mywindow=vo_window;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
209 mygc=vo_gc;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
210 }
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
211 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
215 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
218 {
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
219 printf("Xv: XvQueryAdaptors failed");
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
220 return -1;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
221 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
233 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
234 /* check image formats */
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
235 if (xv_port != 0)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
238 xv_format=0;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
239 for(i = 0; i < formats; i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
240 {
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
243 if (fo[i].id == format)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
244 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
245 xv_format = fo[i].id;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
246 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
247 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
248 if (!xv_format) xv_port = 0;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
249 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
250
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
251 if (xv_port != 0)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
252 {
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
270 #ifdef HAVE_NEW_GUI
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
271 if ( vo_window != None )
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
272 {
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
273 mFullscreen=0;
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
274 dwidth=mdwidth; dheight=mdheight;
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
275 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) )
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
276 {
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
277 mFullscreen=1;
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
278 dwidth=vo_screenwidth;
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
279 dheight=vo_screenwidth * mdheight / mdwidth;
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
280 }
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
281 }
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
282 #endif
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
287 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
289 if ( mFullscreen )
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
290 {
2055
f5146118777e Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents: 2054
diff changeset
291 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
292 drwcX+=drwX;
2055
f5146118777e Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents: 2054
diff changeset
293 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
294 drwcY+=drwY;
2055
f5146118777e Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents: 2054
diff changeset
295 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
f5146118777e Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents: 2054
diff changeset
296 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
297 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
298 }
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
299 #ifdef HAVE_NEW_GUI
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
300 if ( vo_window == None )
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
301 #endif
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
302 saver_off(mDisplay); // turning off screen saver
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
303 return 0;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
304 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
305 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
307 printf("Sorry, Xv not supported by this X11 version/driver\n");
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
308 printf("******** Try with -vo x11 or -vo sdl *********\n");
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
309 return 1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
312 static const vo_info_t * get_info(void)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
313 { return &vo_info; }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
315 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
317 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
318 * allocate XvImages. FIXME: no error checking, without
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
319 * mit-shm this will bomb...
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
323 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
324 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
325 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
330 shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
331 memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
332 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
335 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
336 {
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
337 XShmDetach( mDisplay,&Shminfo[foo] );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
338 shmdt( Shminfo[foo].shmaddr );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
339 XFlush( mDisplay );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
340 XSync(mDisplay, False);
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
341 return;
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
342 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
343
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
344 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
347 if(e&VO_EVENT_RESIZE)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
352 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
354 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
355 if ( vo_window != None )
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
356 {
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
357 mFullscreen=0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
358 dwidth=mdwidth; dheight=mdheight;
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
359 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) )
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
360 {
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
361 mFullscreen=1;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
362 dwidth=vo_screenwidth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
363 dheight=vo_screenwidth * mdheight / mdwidth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
364 }
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
365 }
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
366 #endif
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
367
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
368 if ( mFullscreen )
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
369 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
370 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
371 drwcX+=drwX;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
372 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
373 drwcY+=drwY;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
374 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
375 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
614
f83ec60bce49 fprintf(stderr converted to printf(
szabii
parents: 612
diff changeset
376 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
377 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
384 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
389 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
392 0, 0, image_width, image_height,
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
393 drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight),
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
400 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
401 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
402
247
dd107cd7686d OSD/SUB support
arpi_esp
parents: 182
diff changeset
403
dd107cd7686d OSD/SUB support
arpi_esp
parents: 182
diff changeset
404
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
405 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
406 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
407 uint8_t *src;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
408 uint8_t *dst;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
409 int i;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
412 src = image[0];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
413 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
414 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
415 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
416 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
417 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
418 src+=stride[0];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
419 dst+=image_width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
420 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
421
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
422 x/=2;y/=2;w/=2;h/=2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
425 src = image[2];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
426 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
427 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
428 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
429 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
430 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
431 src+=stride[2];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
432 dst+=image_width/2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
435 src = image[1];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
436 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
437 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
438 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
439 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
440 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
441 src+=stride[1];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
442 dst+=image_width/2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
443 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
444 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
445 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
447 static uint32_t draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
449 int foo;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
451 switch (xv_format) {
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
452 case IMGFMT_YUY2:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
453 case IMGFMT_UYVY:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
454 case IMGFMT_YVYU:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
455
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
456 // YUY2 packed, flipped
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
457 #if 0
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
458 int i;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
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
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
461 s+=image_width*image_height;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
462 for(i=0;i<image_height;i++) {
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
463 s-=image_width;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
464 memcpy(d,s,image_width*2);
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
465 d+=image_width;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
466 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
469 #endif
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
470 break;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
471
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
472 case IMGFMT_YV12:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
473 case IMGFMT_I420:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
474 case IMGFMT_IYUV:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
475
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
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
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
480 break;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
481 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
482
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
483 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
484 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
485
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
486 static uint32_t query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487 {
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
488
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
489 // umm, this is a kludge, we need to ask the server.. (see init function above)
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
490 return 1;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
491 /*
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
492 switch(format)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
493 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
494 case IMGFMT_YV12:
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
495 case IMGFMT_YUY2:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
496 return 1;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
497 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
498 return 0;
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
499 */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
500 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
502 static void uninit(void)
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
503 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
504 int i;
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
505 #ifdef HAVE_NEW_GUI
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
506 if ( vo_window == None )
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
507 #endif
1924
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
508 {
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
509 saver_on(mDisplay); // screen saver back on
1924
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
510 XDestroyWindow( mDisplay,mywindow );
6185fef2703a XDestroyWindow fix baze.
pontscho
parents: 1909
diff changeset
511 }
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
514
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
516