annotate libvo/vo_xv.c @ 8248:77a842733412

xvidencopts: - document quant_range, hintedme and hintfile options - no more {min,max}_[{i,p}]quantizer options - add a note about buggy options
author rguyom
date Fri, 22 Nov 2002 08:23:20 +0000
parents 5b39e79af5fe
children 604f0cde816c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
1 /* vo_xv.c, X11 Xv interface */
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
2
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
3 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
4 // Use option -double to enable double buffering! (default: single buffer)
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
5 #define NUM_BUFFERS 3
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
6
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
7 /*
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
8 Buffer allocation:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
9
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
10 -nodr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
11 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
12 2: 2*TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
13
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
14 -dr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
15 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
16 3: 2*STATIC+TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
17 */
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
18
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "config.h"
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
24 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
33 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
34
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
35 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
36 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
37 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
38
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
39 #include "../postproc/rgb2rgb.h"
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
40
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
41 #ifdef HAVE_NEW_GUI
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
42 #include "../Gui/interface.h"
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
43 #endif
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
44
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
45 static vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
47 "X11/Xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
48 "xv",
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
49 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
50 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
53 LIBVO_EXTERN(xv)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
54
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 #include <X11/extensions/Xv.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 #include <X11/extensions/Xvlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 // FIXME: dynamically allocate this stuff
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 static void allocate_xvimage(int);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 static unsigned int ver,rel,req,ev,err;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 static unsigned int formats, adaptors,i,xv_port,xv_format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 static XvAdaptorInfo *ai;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 static XvImageFormatValues *fo;
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
63
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
64 static int current_buf=0;
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
65 static int current_ip_buf=0;
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
66 static int num_buffers=1; // default
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
67 static XvImage* xvimage[NUM_BUFFERS];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68
6719
5291d74a60c9 xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents: 6417
diff changeset
69 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
74 /* since it doesn't seem to be defined on some platforms */
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
75 int XShmGetEventBase(Display*);
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
76
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
77 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
6417
44bca09c1edd 100l accidently removed a line too much (Shmem_Flag)
atmos4
parents: 6416
diff changeset
78 static int Shmem_Flag;
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
79 #endif
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
80
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static uint32_t image_format;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
84 static int flip_flag;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
86 static Window mRoot;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
87 static uint32_t drwX,drwY,drwBorderWidth,drwDepth;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
88 static uint32_t dwidth,dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
90 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
91
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
92 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
93 x0+=(vo_panscan_x>>2);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
94 vo_draw_alpha_yv12(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
95 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
96 xvimage[current_buf]->pitches[0]*y0+x0,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
97 }
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_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
100 x0+=(vo_panscan_x>>2);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
101 vo_draw_alpha_yuy2(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
102 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
103 xvimage[current_buf]->pitches[0]*y0+2*x0,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
104 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
105
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
106 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
107 x0+=(vo_panscan_x>>2);
6295
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
108 vo_draw_alpha_yuy2(w,h,src,srca,stride,
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
109 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
3368f774d9a4 use offsets/pitches for OSD too
arpi
parents: 6249
diff changeset
110 xvimage[current_buf]->pitches[0]*y0+2*x0+1,xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
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
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
116 static int xv_set_eq(char *name, int value)
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
117 {
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
118 XvAttribute *attributes;
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
119 int howmany, xv_atom;
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
120
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
121 mp_dbg(MSGT_VO, MSGL_V, "xv_set_eq called! (%s, %d)\n", name, value);
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
122
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
123 /* get available attributes */
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
124 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
125 for (i = 0; i < howmany && attributes; i++)
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
126 if (attributes[i].flags & XvSettable)
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
127 {
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
128 xv_atom = XInternAtom(mDisplay, attributes[i].name, True);
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
129 /* since we have SET_DEFAULTS first in our list, we can check if it's available
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
130 then trigger it if it's ok so that the other values are at default upon query */
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
131 if (xv_atom != None)
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
132 {
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
133 int hue = 0,port_value,port_min,port_max;
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
134
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
135 if(!strcmp(attributes[i].name,"XV_BRIGHTNESS") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
136 (!strcasecmp(name, "brightness")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
137 port_value = value;
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
138 else
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
139 if(!strcmp(attributes[i].name,"XV_CONTRAST") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
140 (!strcasecmp(name, "contrast")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
141 port_value = value;
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
142 else
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
143 if(!strcmp(attributes[i].name,"XV_SATURATION") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
144 (!strcasecmp(name, "saturation")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
145 port_value = value;
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
146 else
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
147 if(!strcmp(attributes[i].name,"XV_HUE") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
148 (!strcasecmp(name, "hue")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
149 { port_value = value; hue=1; }
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
150 else
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
151 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
152 if(!strcmp(attributes[i].name,"XV_RED_INTENSITY") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
153 (!strcasecmp(name, "red_intensity")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
154 port_value = value;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
155 else
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
156 if(!strcmp(attributes[i].name,"XV_GREEN_INTENSITY") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
157 (!strcasecmp(name, "green_intensity")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
158 port_value = value;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
159 else
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
160 if(!strcmp(attributes[i].name,"XV_BLUE_INTENSITY") &&
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
161 (!strcasecmp(name, "blue_intensity")))
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
162 port_value = value;
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
163 else continue;
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
164
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
165 port_min = attributes[i].min_value;
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
166 port_max = attributes[i].max_value;
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
167
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
168 /* nvidia hue workaround */
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
169 if ( hue && port_min == 0 && port_max == 360 ){
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
170 port_value = (port_value>=0) ? (port_value-100) : (port_value+100);
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
171 }
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
172
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
173 // -100 -> min
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
174 // 0 -> (max+min)/2
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
175 // +100 -> max
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
176 port_value = (port_value+100)*(port_max-port_min)/200+port_min;
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
177 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
178 return(VO_TRUE);
4296
a20c333d6c09 Gamma correction (based on patch of P«¡sztor Szil«¡rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
179 }
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
180 }
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
181 return(VO_FALSE);
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
182 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
183
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
184 static int xv_get_eq(char *name, int *value)
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
185 {
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
186 XvAttribute *attributes;
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
187 int howmany, xv_atom;
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
188
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
189 /* get available attributes */
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
190 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
191 for (i = 0; i < howmany && attributes; i++)
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
192 if (attributes[i].flags & XvGettable)
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
193 {
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
194 xv_atom = XInternAtom(mDisplay, attributes[i].name, True);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
195 /* since we have SET_DEFAULTS first in our list, we can check if it's available
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
196 then trigger it if it's ok so that the other values are at default upon query */
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
197 if (xv_atom != None)
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
198 {
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7124
diff changeset
199 int val, port_value=0, port_min, port_max;
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
200
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
201 XvGetPortAttribute(mDisplay, xv_port, xv_atom, &port_value);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
202
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
203 port_min = attributes[i].min_value;
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
204 port_max = attributes[i].max_value;
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
205 val=(port_value-port_min)*200/(port_max-port_min)-100;
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
206
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
207 if(!strcmp(attributes[i].name,"XV_BRIGHTNESS") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
208 (!strcasecmp(name, "brightness")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
209 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
210 else
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
211 if(!strcmp(attributes[i].name,"XV_CONTRAST") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
212 (!strcasecmp(name, "contrast")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
213 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
214 else
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
215 if(!strcmp(attributes[i].name,"XV_SATURATION") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
216 (!strcasecmp(name, "saturation")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
217 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
218 else
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
219 if(!strcmp(attributes[i].name,"XV_HUE") &&
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
220 (!strcasecmp(name, "hue"))){
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
221 /* nasty nvidia detect */
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
222 if (port_min == 0 && port_max == 360)
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
223 *value = (val>=0) ? (val-100) : (val+100);
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
224 else
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
225 *value = val;
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
226 } else
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
227 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
228 if(!strcmp(attributes[i].name,"XV_RED_INTENSITY") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
229 (!strcasecmp(name, "red_intensity")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
230 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
231 else
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
232 if(!strcmp(attributes[i].name,"XV_GREEN_INTENSITY") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
233 (!strcasecmp(name, "green_intensity")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
234 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
235 else
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
236 if(!strcmp(attributes[i].name,"XV_BLUE_INTENSITY") &&
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
237 (!strcasecmp(name, "blue_intensity")))
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
238 *value = val;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
239 else continue;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
240
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
241 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n", name, *value);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
242 return(VO_TRUE);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
243 }
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
244 }
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
245 return(VO_FALSE);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
246 }
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
247
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
248 static void deallocate_xvimage(int foo);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
249
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
250 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
251 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 */
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
254 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
256 // int screen;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
257 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
258 // char *name = ":0.0";
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
259 XSizeHints hint;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
260 XVisualInfo vinfo;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
261 XGCValues xgcv;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
262 XSetWindowAttributes xswa;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7124
diff changeset
263 XWindowAttributes attribs;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
264 unsigned long xswamask;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7124
diff changeset
265 int depth;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
266 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
267 int vm=0;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
268 unsigned int modeline_width, modeline_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
269 static uint32_t vm_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
270 static uint32_t vm_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
271 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
273 panscan_init();
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
274
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
275 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
276 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
277
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
278 image_height = height;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
279 image_width = width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
280 image_format=format;
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
281
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
282 vo_mouse_autohide=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
283
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
284 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
285 vo_dwidth=d_width; vo_dheight=d_height;
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
286
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
287 #ifdef HAVE_XF86VM
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
288 if( flags&0x02 ) vm = 1;
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
289 #endif
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
290 flip_flag=flags&8;
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
291 num_buffers=vo_doublebuffering?(vo_directrendering?NUM_BUFFERS:2):1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
292
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
293 /* check image formats */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
294 xv_format=0;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
295 if(format==IMGFMT_BGR24) format=IMGFMT_YV12;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
296 for(i = 0; i < formats; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
297 mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
298 if (fo[i].id == format) xv_format = fo[i].id;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
299 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
300 if (!xv_format) return -1;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
301
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
302 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
303
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
304 #ifdef HAVE_NEW_GUI
5985
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
305 if(use_gui)
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
306 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
307 else
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
308 #endif
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
309 {
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
310 hint.x = vo_dx;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
311 hint.y = vo_dy;
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
312 hint.width = d_width;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
313 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
314 aspect(&d_width,&d_height,A_NOZOOM);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
315 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
316 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
317 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
318 if ((d_width==0) && (d_height==0))
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
319 { vm_width=image_width; vm_height=image_height; }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
320 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
321 { vm_width=d_width; vm_height=d_height; }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
322 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height);
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
323 hint.x=(vo_screenwidth-modeline_width)/2;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
324 hint.y=(vo_screenheight-modeline_height)/2;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
325 hint.width=modeline_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
326 hint.height=modeline_height;
6125
018a0d7dddd4 -vm -fs fix by Tobias Diedrich <ranma@gmx.at>
arpi
parents: 6095
diff changeset
327 aspect_save_screenres(modeline_width,modeline_height);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
328 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
329 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
330 #endif
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
331 if ( vo_fs )
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
332 {
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
333 #ifdef X11_FULLSCREEN
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
334 /* this code replaces X11_FULLSCREEN hack in mplayer.c
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
335 * 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
336 * 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
337 * 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
338 * 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
339 */
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
340
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
341 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
342 #endif
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
343
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
344 }
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
345 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for?
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
346 vo_dwidth=d_width; vo_dheight=d_height;
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
347 hint.flags = PPosition | PSize /* | PBaseSize */;
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
348 hint.base_width = hint.width; hint.base_height = hint.height;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
349 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
350 depth=attribs.depth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
351 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
352 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
353
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
354 xswa.background_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
355 xswa.border_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
356 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
357
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
358 if ( WinID>=0 ){
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
359 vo_window = WinID ? ((Window)WinID) : mRootWin;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
360 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
361 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
362 XUnmapWindow( mDisplay,vo_window );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
363 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6793
diff changeset
364 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
6366
287c2e661172 -wid fix by "Markus J.R." <random@shell.dnload.com>
atmos4
parents: 6332
diff changeset
365 XMapWindow( mDisplay,vo_window );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
366 } else { drwX=vo_dx; drwY=vo_dy; }
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
367 } else
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
368 if ( vo_window == None ){
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
369 vo_window = XCreateWindow(mDisplay, mRootWin,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
370 hint.x, hint.y, hint.width, hint.height,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
371 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
372
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
373 vo_x11_classhint( mDisplay,vo_window,"xv" );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
374 vo_hidecursor(mDisplay,vo_window);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
375
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6793
diff changeset
376 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask |
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5821
diff changeset
377 ((WinID==0) ? 0 : (PointerMotionMask
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4629
diff changeset
378 | ButtonPressMask | ButtonReleaseMask
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
379 )));
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
380 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
381 XSetWMNormalHints( mDisplay,vo_window,&hint );
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
382 XMapWindow(mDisplay, vo_window);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
383 if ( flags&1 ) vo_x11_fullscreen();
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
384 #ifdef HAVE_XINERAMA
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
385 vo_x11_xinerama_move(mDisplay,vo_window);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
386 #endif
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
387 } else
7758
27b3b56fa8a5 fix fullscreen
pontscho
parents: 7757
diff changeset
388 if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
27b3b56fa8a5 fix fullscreen
pontscho
parents: 7757
diff changeset
389
7765
dbf1e5cfadbd fix memleak
pontscho
parents: 7758
diff changeset
390 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
391 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
392 XFlush(mDisplay);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
393 XSync(mDisplay, False);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
394 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
395 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
396 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
397 /* Grab the mouse pointer in our window */
7539
56ea9db91251 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents: 7526
diff changeset
398 if(vo_grabpointer)
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
399 XGrabPointer(mDisplay, vo_window, True, 0,
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
400 GrabModeAsync, GrabModeAsync,
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
401 vo_window, None, CurrentTime);
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
402 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
403 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
404 #endif
5985
cb393303865d the Right Fix for gui window setup
arpi
parents: 5981
diff changeset
405 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
406
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
407 mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port );
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
408
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
409 switch (xv_format){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
410 case IMGFMT_YV12:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
411 case IMGFMT_I420:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
412 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
413 case IMGFMT_YUY2:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
414 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
415 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
416 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
417 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
418
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
419 if ( vo_config_count )
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
420 for(current_buf=0;current_buf<num_buffers;++current_buf)
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
421 deallocate_xvimage(current_buf);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
422
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
423 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
424 allocate_xvimage(current_buf);
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
425
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
426 current_buf=0;
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
427 current_ip_buf=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
428
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
429 #if 0
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
430 set_gamma_correction();
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
431 #endif
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
432
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
433 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
7526
e3ca9e707857 - fix new afm/vfm support
pontscho
parents: 7472
diff changeset
434 if ( ( flags&1 )&&( WinID <= 0 ) )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
435 {
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
436 aspect(&vo_dwidth,&vo_dheight,A_ZOOM);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
437 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
438 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
439 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
440 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
441 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
442 }
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
443
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
444 panscan_calc();
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6016
diff changeset
445
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
446 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
447
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4307
diff changeset
448 saver_off(mDisplay); // turning off screen saver
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
449 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
452 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
453 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
454 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
455 * allocate XvImages. FIXME: no error checking, without
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
456 * mit-shm this will bomb... trzing to fix ::atmos
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
457 */
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
458 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
459 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1;
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
460 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
461 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
462 Shmem_Flag = 0;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
463 mp_msg(MSGT_VO,MSGL_INFO, "Shared memory not supported\nReverting to normal Xv\n" );
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
464 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
465 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
466 {
7848
3c1d30a1afc0 compiler warning fixes by Dominik
arpi
parents: 7766
diff changeset
467 xvimage[foo] = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
469 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
470 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
471 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
472
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
473 xvimage[foo]->data = Shminfo[foo].shmaddr;
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
474 XShmAttach(mDisplay, &Shminfo[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
475 XSync(mDisplay, False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
476 shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
477 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
478 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
479 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
480 {
7848
3c1d30a1afc0 compiler warning fixes by Dominik
arpi
parents: 7766
diff changeset
481 xvimage[foo] = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
482 xvimage[foo]->data = malloc(xvimage[foo]->data_size);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
483 XSync(mDisplay,False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
484 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
485 memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
486 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
488
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
489 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
490 {
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
491 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
492 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
493 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
494 XShmDetach( mDisplay,&Shminfo[foo] );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
495 shmdt( Shminfo[foo].shmaddr );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
496 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
497 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
498 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
499 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
500 free(xvimage[foo]->data);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
501 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
502 XFree(xvimage[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
503
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
504 XFlush( mDisplay );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
505 XSync(mDisplay, False);
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
506 return;
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
507 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
508
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
509 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
510 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
511 int e=vo_x11_check_events(mDisplay);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
512 if(e&VO_EVENT_RESIZE)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
513 {
7056
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
514 if (vo_fs) {
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
515 e |= VO_EVENT_EXPOSE;
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
516 XClearWindow(mDisplay, vo_window);
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
517 XFlush(mDisplay);
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
518 }
ad9a06fc40f8 added forced window clearing for Xv, because on my setup (sawfish,
arpi
parents: 6953
diff changeset
519
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
520 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth );
5981
25f0bf24fcf8 - the "black bars" in xv bug fixed (drwX=drwY=0)
arpi
parents: 5975
diff changeset
521 drwX = drwY = 0;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
522 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
523
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
524 aspect(&dwidth,&dheight,A_NOZOOM);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
525 if ( vo_fs )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
526 {
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
527 aspect(&dwidth,&dheight,A_ZOOM);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
528 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
529 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
530 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
531 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
532 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
533 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
534 }
1858
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
535 if ( e & VO_EVENT_EXPOSE )
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
536 {
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
537 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
538 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
539 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
540 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False);
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
541 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), False);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
542 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
543 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
544 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
545 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
546 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1);
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
547 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight));
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
548 }
1858
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
549 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
550 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
551
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
552 static void draw_osd(void)
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
553 { vo_draw_text(image_width-(vo_panscan_x>>1),image_height,draw_alpha_fnc);}
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
554
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
555 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
556 {
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
557
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
558 #ifdef HAVE_SHM
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
559 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
560 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
561 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
562 0, 0, image_width, image_height,
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
563 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y,
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
564 False);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
565 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
566 else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
567 #endif
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
568 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
569 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
570 0, 0, image_width, image_height,
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
571 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
572 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
573 if (num_buffers>1){
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
574 current_buf=vo_directrendering?0:((current_buf+1)%num_buffers);
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
575 XFlush(mDisplay);
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
576 } else
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
577 XSync(mDisplay, False);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
578 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
579 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
580
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
581 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
582 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
583 uint8_t *dst;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
584
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
585 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
586 xvimage[current_buf]->pitches[0]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
587 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
588
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
589 x/=2;y/=2;w/=2;h/=2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
590
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
591 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
592 xvimage[current_buf]->pitches[1]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
593 if(image_format!=IMGFMT_YV12)
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
594 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
595 else
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
596 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]);
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
597
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
598 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] +
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
599 xvimage[current_buf]->pitches[2]*y + x;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
600 if(image_format==IMGFMT_YV12)
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
601 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], stride[1]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
602 else
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
603 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], stride[2]);
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
604
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
605 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
606 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
607
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
608 static uint32_t draw_frame(uint8_t *src[]){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
609 printf("draw_frame() called!!!!!!");
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
610 return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
611 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
612
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
613 static uint32_t draw_image(mp_image_t *mpi){
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
614 if(mpi->flags&MP_IMGFLAG_DIRECT){
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
615 // direct rendering:
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
616 current_buf=(int)(mpi->priv); // hack!
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
617 return VO_TRUE;
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
618 }
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
619 if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) return VO_TRUE; // done
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
620 if(mpi->flags&MP_IMGFLAG_PLANAR){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
621 draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,0,0);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
622 return VO_TRUE;
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
623 }
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
624 if(mpi->flags&MP_IMGFLAG_YUV){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
625 // packed YUV:
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
626 memcpy_pic(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
627 mpi->planes[0],mpi->w*(mpi->bpp/8),mpi->h,
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
628 xvimage[current_buf]->pitches[0], mpi->stride[0]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
629 return VO_TRUE;
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
630 }
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
631 if(mpi->imgfmt==IMGFMT_BGR24){
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
632 rgb24toyv12(mpi->planes[0]+(flip_flag ? 3*image_width*(image_height-1) : 0),
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
633 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
634 xvimage[current_buf]->data+xvimage[current_buf]->offsets[2],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
635 xvimage[current_buf]->data+xvimage[current_buf]->offsets[1],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
636 image_width,image_height,
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
637 xvimage[current_buf]->pitches[0],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
638 xvimage[current_buf]->pitches[1],
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
639 flip_flag ? -mpi->stride[0] : mpi->stride[0]);
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
640 return VO_TRUE;
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
641 }
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
642 return VO_FALSE; // not (yet) supported
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
643 }
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
644
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
645 static uint32_t get_image(mp_image_t *mpi){
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
646 int buf=current_buf; // we shouldn't change current_buf unless we do DR!
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
647 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static
5006
2b9b34b7cdf8 DR fixed for BGR24
arpi
parents: 4993
diff changeset
648 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :(
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
649 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
650 if(mpi->flags&MP_IMGFLAG_READABLE &&
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
651 (mpi->type==MP_IMGTYPE_IPB || mpi->type==MP_IMGTYPE_IP)){
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
652 // reference (I/P) frame of IP or IPB:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
653 if(num_buffers<2) return VO_FALSE; // not enough
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
654 current_ip_buf^=1;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
655 // for IPB with 2 buffers we can DR only one of the 2 P frames:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
656 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && current_ip_buf) return VO_FALSE;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
657 buf=current_ip_buf;
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
658 if(mpi->type==MP_IMGTYPE_IPB) ++buf; // preserve space for B
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
659 }
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
660 if(mpi->height > xvimage[buf]->height) return VO_FALSE; //buffer to small
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
661 if(mpi->width*(mpi->bpp/8) > xvimage[buf]->pitches[0]) return VO_FALSE; //buffer to small
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
662 if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) ||
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
663 (mpi->width*(mpi->bpp/8)==xvimage[buf]->pitches[0]) ){
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
664 current_buf=buf;
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
665 mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
666 mpi->stride[0]=xvimage[current_buf]->pitches[0];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
667 mpi->width=mpi->stride[0]/(mpi->bpp/8);
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
668 if(mpi->flags&MP_IMGFLAG_PLANAR){
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
669 if(mpi->flags&MP_IMGFLAG_SWAPPED){
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
670 // I420
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
671 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
672 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
673 mpi->stride[1]=xvimage[current_buf]->pitches[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
674 mpi->stride[2]=xvimage[current_buf]->pitches[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
675 } else {
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
676 // YV12
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
677 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
678 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
679 mpi->stride[1]=xvimage[current_buf]->pitches[2];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
680 mpi->stride[2]=xvimage[current_buf]->pitches[1];
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
681 }
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
682 }
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
683 mpi->flags|=MP_IMGFLAG_DIRECT;
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
684 mpi->priv=(void*)current_buf;
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
685 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
686 return VO_TRUE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
687 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
688 return VO_FALSE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
689 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
690
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
691 static uint32_t query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
692 {
7694
b64f14fdadfb also set VFCAP_ACCEPT_STRIDE when draw_image() is implemented
arpi
parents: 7684
diff changeset
693 int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
694 /* check image formats */
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
695 if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag&=~2;flag|=VFCAP_FLIP;} // conversion!
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
696 for(i = 0; i < formats; i++){
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
697 if (fo[i].id == format) return flag; //xv_format = fo[i].id;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
698 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
699 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
700 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
701
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
702 static void uninit(void)
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
703 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
704 int i;
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
705 if ( !vo_config_count ) return;
7766
52171f231d4d fix memleak again
pontscho
parents: 7765
diff changeset
706 free( ai );
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
707 saver_on(mDisplay); // screen saver back on
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
708 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
709 #ifdef HAVE_XF86VM
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
710 vo_vm_close(mDisplay);
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
711 #endif
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
712 vo_x11_uninit();
322
4e69a8e2700a Screensaver and monitor powersafe function is switched off when playing a
laaz
parents: 249
diff changeset
713 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
714
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
715 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
716 {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
717 XvPortID xv_p;
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
718 int busy_ports=0;
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
719
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
720 if(arg)
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
721 {
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
722 mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg);
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
723 return ENOSYS;
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
724 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
725 if (!vo_init()) return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
726
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
727 xv_port = 0;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
728 /* check for Xvideo extension */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
729 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
730 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n");
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
731 mp_msg(MSGT_VO,MSGL_ERR,"******** Try with -vo x11 or -vo sdl *********\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
732 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
733 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
734
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
735 /* check for Xvideo support */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
736 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
737 mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
738 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
739 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
740
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
741 /* check adaptors */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
742 for (i = 0; i < adaptors && xv_port == 0; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
743 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
744 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p)
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
745 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) {
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
746 xv_port = xv_p;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
747 break;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
748 } else {
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
749 mp_msg(MSGT_VO,MSGL_WARN,"Xv: could not grab port %i\n", (int)xv_p);
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
750 ++busy_ports;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
751 }
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
752 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
753 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
754 if(!xv_port){
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
755 if(busy_ports)
6249
e5031c75e940 message wording fix by Diego B.
arpi
parents: 6231
diff changeset
756 mp_msg(MSGT_VO,MSGL_ERR,"Could not find free Xvideo port - maybe another process is already using it.\n"
6174
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
757 "Close all video applications, and try again. If that does not help,\n"
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
758 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n");
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
759 else
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
760 mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n"
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
761 "Run 'xvinfo' to verify its Xv support, and read Xv section of DOCS/video.html !\n"
9676d7735332 different message for busy Xv ports and missing Xv ports
arpi
parents: 6125
diff changeset
762 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
763 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
764 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
765
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
766 {
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
767 int howmany, i;
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
768 const XvAttribute * const attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
769
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
770 for (i = 0; i < howmany && attributes; i++)
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
771 if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY"))
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
772 {
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
773 const Atom autopaint = XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
774 XvSetPortAttribute(mDisplay, xv_port, autopaint, 1);
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
775 break;
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
776 }
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
777 }
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
778
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
779 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
780
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
781 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
782 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
783
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
784 static uint32_t control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
785 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
786 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
787 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
788 return query_format(*((uint32_t*)data));
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
789 case VOCTRL_GET_IMAGE:
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
790 return get_image(data);
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
791 case VOCTRL_DRAW_IMAGE:
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
792 return draw_image(data);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
793 case VOCTRL_GUISUPPORT:
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
794 return VO_TRUE;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
795 case VOCTRL_GET_PANSCAN:
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
796 if ( !vo_config_count || !vo_fs ) return VO_FALSE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
797 return VO_TRUE;
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
798 case VOCTRL_FULLSCREEN:
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
799 vo_x11_fullscreen();
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
800 /* indended, fallthrough to update panscan on fullscreen/windowed switch */
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
801 case VOCTRL_SET_PANSCAN:
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
802 if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) )
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
803 {
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
804 int old_y = vo_panscan_y;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
805 panscan_calc();
6332
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
806
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
807 if(old_y != vo_panscan_y)
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
808 {
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
809 XClearWindow(mDisplay, vo_window);
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
810 XFlush(mDisplay);
ff858ab25b11 -vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents: 6311
diff changeset
811 }
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
812 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
813 return VO_TRUE;
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
814 case VOCTRL_SET_EQUALIZER:
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
815 {
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
816 va_list ap;
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
817 int value;
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
818
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
819 va_start(ap, data);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
820 value = va_arg(ap, int);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
821 va_end(ap);
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
822
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
823 return(xv_set_eq(data, value));
6781
924263b4df10 eq reworked
alex
parents: 6764
diff changeset
824 }
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
825 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
826 {
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
827 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
828 int *value;
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
829
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
830 va_start(ap, data);
6793
48d432a8d531 more eq cleanup
arpi
parents: 6786
diff changeset
831 value = va_arg(ap, int*);
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
832 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
833
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
834 return(xv_get_eq(data, value));
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
835 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
836 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
837 return VO_NOTIMPL;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
838 }