annotate libvo/vo_xv.c @ 5945:f9fe22a52e80

fix aspect ratio handling
author pontscho
date Fri, 03 May 2002 13:12:46 +0000
parents 5074aa8fae5a
children caac20b1ca79
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
1
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
2 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
3 // Use option -double to enable double buffering! (default: single buffer)
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
4 #define NUM_BUFFERS 2
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
6 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
7 * vo_xv.c, X11 Xv interface
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 *
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
9 * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 * Hacked into mpeg2dec by
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
12 *
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 *
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 * Xv image suuport by Gerd Knorr <kraxel@goldbach.in-berlin.de>
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
16 * fullscreen support by Pontscho
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
17 * double buffering support by A'rpi
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "config.h"
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
25 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 LIBVO_EXTERN(xv)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
36 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
37
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
38 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
39 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
40 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
41
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
42 #include "../postproc/rgb2rgb.h"
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
43
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
44 static vo_info_t vo_info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
46 "X11/Xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
47 "xv",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
48 "Gerd Knorr <kraxel@goldbach.in-berlin.de>",
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
49 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
52 extern int verbose;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
53
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 /* since it doesn't seem to be defined on some platforms */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 int XShmGetEventBase(Display*);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 static unsigned char *ImageData;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 /* X11 related variables */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 static XImage *myximage;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 static int depth, bpp, mode;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 #include <X11/extensions/Xv.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 #include <X11/extensions/Xvlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 // FIXME: dynamically allocate this stuff
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 static void allocate_xvimage(int);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 static unsigned int ver,rel,req,ev,err;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 static unsigned int formats, adaptors,i,xv_port,xv_format;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 static XvAdaptorInfo *ai;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 static XvImageFormatValues *fo;
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
73
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
74 static int current_buf=0;
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
75 static int num_buffers=1; // default
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
76 static XvImage* xvimage[NUM_BUFFERS];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 #include <X11/extensions/XShm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 static int Shmem_Flag;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
83 //static int Quiet_Flag; <-- What is that for ? Albeu.
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
84 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 static int gXErrorFlag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static int CompletionType = -1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 static uint32_t image_format;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
91 static int flip_flag;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
93 static Window mRoot;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
94 static uint32_t drwX,drwY,drwBorderWidth,drwDepth;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
95 static uint32_t dwidth,dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
97 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
98
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
99 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
100 vo_draw_alpha_yv12(w,h,src,srca,stride,xvimage[current_buf]->data+image_width*y0+x0,image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
101 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
102
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
103 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
104 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0),2*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
105 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
106
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
107 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
108 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0)+1,2*image_width);
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
109 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
110
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
111 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
112 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
113
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
114 static int __xv_set_video_eq( const vidix_video_eq_t *info,int use_reset)
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
115 {
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
116 XvAttribute *attributes;
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
117 int howmany, xv_min,xv_max,xv_atomka;
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
118 static int was_reset = 0;
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
119 /* get available attributes */
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
120 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
121 /* first pass try reset */
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
122 if(use_reset)
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
123 {
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
124 for (i = 0; i < howmany && attributes; i++)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
125 {
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
126 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS"
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
127 ))
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
128 {
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
129 was_reset = 1;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
130 mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n");
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
131 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True);
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
132 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value);
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
133 }
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
134 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
135 /* for safety purposes */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
136 if(!was_reset) return ENOSYS;
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
137 }
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
138 for (i = 0; i < howmany && attributes; i++)
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
139 {
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
140 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
141 {
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
142 xv_min = attributes[i].min_value;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
143 xv_max = attributes[i].max_value;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
144 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True);
4307
c494cc258eb8 Attempt to fix NVidia problems
nick
parents: 4296
diff changeset
145 /* 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
146 then trigger it if it's ok so that the other values are at default upon query */
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
147 if (xv_atomka != None)
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
148 {
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
149 int port_value,port_min,port_max,port_mid;
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
150 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
151 && (info->cap & VEQ_CAP_BRIGHTNESS))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
152 port_value = info->brightness;
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
153 else
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
154 if(strcmp(attributes[i].name,"XV_SATURATION") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
155 && (info->cap & VEQ_CAP_SATURATION))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
156 port_value = info->saturation;
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
157 else
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
158 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
159 && (info->cap & VEQ_CAP_CONTRAST))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
160 port_value = info->contrast;
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
161 else
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
162 if(strcmp(attributes[i].name,"XV_HUE") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
163 && (info->cap & VEQ_CAP_HUE))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
164 port_value = info->hue;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
165 else
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
166 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
167 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
168 && (info->cap & VEQ_CAP_RGB_INTENSITY))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
169 port_value = info->red_intensity;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
170 else
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
171 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
172 && (info->cap & VEQ_CAP_RGB_INTENSITY))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
173 port_value = info->green_intensity;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
174 else
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
175 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
176 && (info->cap & VEQ_CAP_RGB_INTENSITY))
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
177 port_value = info->blue_intensity;
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
178 else continue;
4320
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
179 /* means that user has untouched this parameter since
bfcf2517876b RGB independed correction for GATOS's radeon_video driver!
nick
parents: 4317
diff changeset
180 NVidia driver has default == min for XV_HUE but not mid */
4406
d8e5237af111 Minor fix - else 0 is unreachable
nick
parents: 4396
diff changeset
181 if(!port_value && use_reset) continue;
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
182 port_min = xv_min;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
183 port_max = xv_max;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
184 port_mid = (port_min + port_max) / 2;
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
185 port_value = port_mid + (port_value * (port_max - port_min)) / 2000;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
186 mp_msg(MSGT_VO,MSGL_V,"vo_xv: set gamma %s to %i (min %i max %i mid %i)\n",attributes[i].name,port_value,port_min,port_max,port_mid);
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
187 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, port_value);
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
188 }
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
189 }
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
190 }
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
191 return 0;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
192 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
193
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
194
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
195 static int xv_set_video_eq( const vidix_video_eq_t *info)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
196 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
197 return __xv_set_video_eq(info,0);
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
198 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
199
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
200 static int xv_get_video_eq( vidix_video_eq_t *info)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
201 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
202 XvAttribute *attributes;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
203 int howmany, xv_min,xv_max,xv_atomka;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
204 /* get available attributes */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
205 memset(info,0,sizeof(vidix_video_eq_t));
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
206 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
207 for (i = 0; i < howmany && attributes; i++)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
208 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
209 if (attributes[i].flags & XvGettable)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
210 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
211 xv_min = attributes[i].min_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
212 xv_max = attributes[i].max_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
213 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True);
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
214 /* since we have SET_DEFAULTS first in our list, we can check if it's available
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
215 then trigger it if it's ok so that the other values are at default upon query */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
216 if (xv_atomka != None)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
217 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
218 int port_value,port_min,port_max,port_mid;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
219 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value);
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
220 mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value);
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
221
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
222 port_min = xv_min;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
223 port_max = xv_max;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
224 port_mid = (port_min + port_max) / 2;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
225 port_value = ((port_value - port_mid)*2000)/(port_max-port_min);
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
226
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
227 mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value);
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
228
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
229 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
230 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
231 info->cap |= VEQ_CAP_BRIGHTNESS;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
232 info->brightness = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
233 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
234 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
235 if(strcmp(attributes[i].name,"XV_SATURATION") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
236 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
237 info->cap |= VEQ_CAP_SATURATION;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
238 info->saturation = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
239 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
240 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
241 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
242 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
243 info->cap |= VEQ_CAP_CONTRAST;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
244 info->contrast = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
245 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
246 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
247 if(strcmp(attributes[i].name,"XV_HUE") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
248 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
249 info->cap |= VEQ_CAP_HUE;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
250 info->hue = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
251 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
252 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
253 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
254 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
255 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
256 info->cap |= VEQ_CAP_RGB_INTENSITY;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
257 info->red_intensity = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
258 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
259 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
260 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
261 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
262 info->cap |= VEQ_CAP_RGB_INTENSITY;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
263 info->green_intensity = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
264 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
265 else
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
266 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0)
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
267 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
268 info->cap |= VEQ_CAP_RGB_INTENSITY;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
269 info->blue_intensity = port_value;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
270 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
271 else continue;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
272 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
273 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
274 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
275 return 0;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
276 }
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
277
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
278 extern int vo_gamma_brightness;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
279 extern int vo_gamma_saturation;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
280 extern int vo_gamma_contrast;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
281 extern int vo_gamma_hue;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
282 extern int vo_gamma_red_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
283 extern int vo_gamma_green_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
284 extern int vo_gamma_blue_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
285
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
286 static void set_gamma_correction( void )
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
287 {
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
288 vidix_video_eq_t info;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
289 /* try all */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
290 info.cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST | VEQ_CAP_SATURATION |
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
291 VEQ_CAP_HUE | VEQ_CAP_RGB_INTENSITY;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
292 info.flags = 0; /* doesn't matter for xv */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
293 info.brightness = vo_gamma_brightness;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
294 info.contrast = vo_gamma_contrast;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
295 info.saturation = vo_gamma_saturation;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
296 info.hue = vo_gamma_hue;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
297 info.red_intensity = vo_gamma_red_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
298 info.green_intensity = vo_gamma_green_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
299 info.blue_intensity = vo_gamma_blue_intensity;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
300 /* reset with XV_SET_DEFAULTS only once */
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
301 __xv_set_video_eq(&info,1);
4296
a20c333d6c09 Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents: 3990
diff changeset
302 }
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
303
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
304 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
305 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 */
4433
df8e0f71cc3c new info for tuning
nick
parents: 4426
diff changeset
308 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,const vo_tune_info_t *info)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
310 // int screen;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
311 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
312 // char *name = ":0.0";
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
313 XSizeHints hint;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
314 XVisualInfo vinfo;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
315 XEvent xev;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
317 XGCValues xgcv;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
318 XSetWindowAttributes xswa;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
319 unsigned long xswamask;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
320 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
321 int vm=0;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
322 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
323 static uint32_t vm_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
324 static uint32_t vm_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
325 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326
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
327 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
328 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
329
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
330 image_height = height;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
331 image_width = width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
332 image_format=format;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
334 vo_dwidth=d_width; vo_dheight=d_height;
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
335 vo_fs=flags&1;
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
336 if ( vo_fs )
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
337 { vo_old_width=d_width; vo_old_height=d_height; }
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
338
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
339 #ifdef HAVE_XF86VM
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
340 if( flags&0x02 ) vm = 1;
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
341 #endif
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
342 flip_flag=flags&8;
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
343 num_buffers=vo_doublebuffering?NUM_BUFFERS:1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
344
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
345 /* check image formats */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
346 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
347 xv_format=0;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
348 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
349 for(i = 0; i < formats; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
350 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
351 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
352 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
353 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
354
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
355 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
356
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
357 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
358 if ( vo_window == None )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
359 {
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
360 #endif
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
361 hint.x = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
362 hint.y = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
363 hint.width = d_width;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
364 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
365 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
366 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
367 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
368 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
369 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
370 { 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
371 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
372 { 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
373 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
374 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
375 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
376 hint.width=modeline_width;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
377 hint.height=modeline_height;
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
378 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
379 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
380 #endif
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
381 if ( vo_fs )
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
382 {
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
383 hint.width=vo_screenwidth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
384 hint.height=vo_screenheight;
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
385 #ifdef X11_FULLSCREEN
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
386 /* this code replaces X11_FULLSCREEN hack in mplayer.c
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
387 * 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
388 * 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
389 * 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
390 * 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
391 */
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
392
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
393 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
394 #endif
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
395
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
396 }
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
397 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for?
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
398 vo_dwidth=d_width; vo_dheight=d_height;
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
399 hint.flags = PPosition | PSize;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
400 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
401 depth=attribs.depth;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
402 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
403 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
404
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
405 xswa.background_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
406 xswa.border_pixel = 0;
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
407 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
408
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
409 if ( WinID>=0 ){
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
410 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen);
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
411 XUnmapWindow( mDisplay,vo_window );
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
412 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
413 } else
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
414
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
415 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen),
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
416 hint.x, hint.y, hint.width, hint.height,
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
417 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa);
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
418
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
419 vo_x11_classhint( mDisplay,vo_window,"xv" );
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
420 vo_hidecursor(mDisplay,vo_window);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
421
5835
104fce2b92b6 fix fullscreen (?)
pontscho
parents: 5822
diff changeset
422 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask |
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5821
diff changeset
423 ((WinID==0) ? 0 : (PointerMotionMask
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4629
diff changeset
424 #ifdef HAVE_NEW_INPUT
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4629
diff changeset
425 | ButtonPressMask | ButtonReleaseMask
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4629
diff changeset
426 #endif
5822
8e3251d0d9a6 -rootwin fixed, keys work, mouse doesn't
arpi
parents: 5821
diff changeset
427 ))
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4629
diff changeset
428 );
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
429 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
430 if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
431 XMapWindow(mDisplay, vo_window);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
432 #ifdef HAVE_XINERAMA
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
433 vo_x11_xinerama_move(mDisplay,vo_window);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
434 #endif
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
435 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
436 XFlush(mDisplay);
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
437 XSync(mDisplay, False);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
438 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
439 if ( vm )
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
440 {
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
441 /* Grab the mouse pointer in our window */
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
442 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
443 GrabModeAsync, GrabModeAsync,
4795
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
444 vo_window, None, CurrentTime);
b18e61cb457a small changes
pontscho
parents: 4737
diff changeset
445 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
446 }
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
447 #endif
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
448 #ifdef HAVE_NEW_GUI
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
449 }
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
450 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
452 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
453
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
454 switch (xv_format){
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
455 case IMGFMT_YV12:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
456 case IMGFMT_I420:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
457 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
458 case IMGFMT_YUY2:
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
459 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
460 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
461 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
462 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
463
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
464 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
465 allocate_xvimage(current_buf);
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
466
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
467 current_buf=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
469 set_gamma_correction();
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
470
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
471 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
472 if ( vo_fs )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
473 {
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
474 aspect(&vo_dwidth,&vo_dheight,A_ZOOM);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
475 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
476 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2;
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
477 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
478 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
479 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
480 }
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
481
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
482 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
483
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4307
diff changeset
484 saver_off(mDisplay); // turning off screen saver
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
485 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
486 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
488 static const vo_info_t * get_info(void)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
489 { return &vo_info; }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
490
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
491 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
492 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
493 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
494 * allocate XvImages. FIXME: no error checking, without
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
495 * mit-shm this will bomb...
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
496 */
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
497 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
498 else
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 Shmem_Flag = 0;
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
501 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
502 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
503 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
504 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
505 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
507 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
508 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
509 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
510
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
511 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
512 XShmAttach(mDisplay, &Shminfo[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
513 XSync(mDisplay, False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
514 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
515 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
516 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
517 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
518 xvimage[foo] = XvCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
519 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
520 XSync(mDisplay,False);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
521 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
522 memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
523 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
524 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
525
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
526 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
527 {
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
528 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
529 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
530 XShmDetach( mDisplay,&Shminfo[foo] );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
531 shmdt( Shminfo[foo].shmaddr );
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
532 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
533 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
534 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
535 free(xvimage[foo]->data);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
536 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
537 XFree(xvimage[foo]);
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
538
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
539 XFlush( mDisplay );
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
540 XSync(mDisplay, False);
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
541 return;
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
542 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
543
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
544 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
545 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
546 int e=vo_x11_check_events(mDisplay);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
547 if(e&VO_EVENT_RESIZE)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
548 {
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
549 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth );
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
550 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
551
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
552 aspect(&dwidth,&dheight,A_NOZOOM);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
553 if ( vo_fs )
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
554 {
3558
1dbf58c3d50c aspect ratio bug fix for gui
pontscho
parents: 2249
diff changeset
555 aspect(&dwidth,&dheight,A_ZOOM);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
556 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
557 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
558 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
559 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight);
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
560 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
561 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
562 }
1858
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
563 if ( e & VO_EVENT_EXPOSE )
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
564 {
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
565 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
566 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
567 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
568 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
569 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
570 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
571 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
572 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
573 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
574 }
1858
88a88d0a3f94 fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents: 1852
diff changeset
575 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
578 static void draw_osd(void)
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
579 { vo_draw_text(image_width,image_height,draw_alpha_fnc);}
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
580
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
581 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
582 {
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
583 if ( Shmem_Flag )
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
584 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
585 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
586 0, 0, image_width, image_height,
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
587 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight),
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
588 False);
5622
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
589 }
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
590 else
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
591 {
d354889a3944 Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents: 5607
diff changeset
592 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
593 0, 0, image_width, image_height,
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
594 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
595 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
596 if (num_buffers>1){
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
597 current_buf=(current_buf+1)%num_buffers;
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
598 XFlush(mDisplay);
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
599 } else
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
600 XSync(mDisplay, False);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
601 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
603
247
dd107cd7686d OSD/SUB support
arpi_esp
parents: 182
diff changeset
604
dd107cd7686d OSD/SUB support
arpi_esp
parents: 182
diff changeset
605
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
606 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
607 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
608 uint8_t *src;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
609 uint8_t *dst;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
610 int i;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
611
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
612 dst = xvimage[current_buf]->data + image_width * y + x;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
613 src = image[0];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
614 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
615 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
616 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
617 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
618 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
619 src+=stride[0];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
620 dst+=image_width;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
621 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
622
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
623 x/=2;y/=2;w/=2;h/=2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
624
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
625 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x;
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
626 if(image_format!=IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
627 src = image[2];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
628 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
629 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
630 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
631 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
632 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
633 src+=stride[2];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
634 dst+=image_width/2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
635 }
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
636
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
637 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x;
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
638 if(image_format==IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
639 src = image[1];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
640 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
641 else
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
642 for(i=0;i<h;i++)
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
643 {
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
644 memcpy(dst,src,w);
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
645 src+=stride[1];
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
646 dst+=image_width/2;
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
647 }
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
648 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
649 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
650
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
651 static uint32_t draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
652 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
653
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
654 switch (image_format) {
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
655 case IMGFMT_YUY2:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
656 case IMGFMT_UYVY:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
657 case IMGFMT_YVYU:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
658
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
659 // YUY2 packed, flipped
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
660 #if 0
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
661 int i;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
662 unsigned short *s=(unsigned short *)src[0];
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
663 unsigned short *d=(unsigned short *)xvimage[current_buf]->data;
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
664 s+=image_width*image_height;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
665 for(i=0;i<image_height;i++) {
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
666 s-=image_width;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
667 memcpy(d,s,image_width*2);
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
668 d+=image_width;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
669 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
670 #else
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
671 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
672 #endif
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
673 break;
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
674
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
675 case IMGFMT_YV12:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
676 case IMGFMT_I420:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
677 case IMGFMT_IYUV:
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
678
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
679 // YV12 planar
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
680 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height);
4351
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
681 if (xv_format == IMGFMT_YV12)
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
682 {
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
683 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4);
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
684 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4);
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
685 }
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
686 else
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
687 {
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
688 memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4);
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
689 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4);
aac822b8a630 fixed i420 handling
alex
parents: 4320
diff changeset
690 }
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
691 break;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
692
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
693 case IMGFMT_BGR24:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
694
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
695 if(flip_flag) // tricky, using negative src stride:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
696 rgb24toyv12(src[0]+3*image_width*(image_height-1),
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
697 xvimage[current_buf]->data,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
698 xvimage[current_buf]->data+image_width*image_height*5/4,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
699 xvimage[current_buf]->data+image_width*image_height,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
700 image_width,image_height,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
701 image_width,image_width/2,-3*image_width);
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
702 else
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
703 rgb24toyv12(src[0],
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
704 xvimage[current_buf]->data,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
705 xvimage[current_buf]->data+image_width*image_height*5/4,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
706 xvimage[current_buf]->data+image_width*image_height,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
707 image_width,image_height,
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
708 image_width,image_width/2,3*image_width);
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
709 break;
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
710
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
711 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
712
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
713 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
714 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
715
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
716 static uint32_t get_image(mp_image_t *mpi){
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
717 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static
5466
ea1ae0e3ea19 IMGTYPE_IPB fix
arpi
parents: 5316
diff changeset
718 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough
5006
2b9b34b7cdf8 DR fixed for BGR24
arpi
parents: 4993
diff changeset
719 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :(
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
720 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
721 if(mpi->width==image_width){
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
722 if(mpi->flags&MP_IMGFLAG_PLANAR){
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
723 mpi->planes[0]=xvimage[current_buf]->data;
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
724 if(mpi->flags&MP_IMGFLAG_SWAPPED){
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
725 // I420
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
726 mpi->planes[1]=xvimage[current_buf]->data+image_width*image_height;
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
727 mpi->planes[2]=mpi->planes[1]+(image_width>>1)*(image_height>>1);
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
728 } else {
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
729 // YV12
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
730 mpi->planes[2]=xvimage[current_buf]->data+image_width*image_height;
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
731 mpi->planes[1]=mpi->planes[2]+(image_width>>1)*(image_height>>1);
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
732 }
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
733 mpi->stride[0]=image_width;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
734 mpi->stride[1]=mpi->stride[2]=image_width/2;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
735 } else {
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
736 mpi->planes[0]=xvimage[current_buf]->data;
5761
1ba1b0365ab7 100l - fixed yuy2 -dr, reported by Nexus
arpi
parents: 5651
diff changeset
737 mpi->stride[0]=image_width*(mpi->bpp>>3);
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
738 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
739 mpi->flags|=MP_IMGFLAG_DIRECT;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
740 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
741 return VO_TRUE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
742 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
743 return VO_FALSE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
744 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
745
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
746 static uint32_t query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
747 {
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
748 int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD; // FIXME! check for DOWN
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
749 /* check image formats */
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
750 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
751 for(i = 0; i < formats; i++){
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
752 // printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
753 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
754 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
755 return 0;
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
756
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
757 /*
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
758 switch(format){
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
759 case IMGFMT_YUY2:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
760 case IMGFMT_UYVY:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
761 case IMGFMT_YVYU:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
762
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
763 case IMGFMT_YV12:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
764 case IMGFMT_I420:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
765 case IMGFMT_IYUV:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
766
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
767 case IMGFMT_BGR24:
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
768
408
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
769 // umm, this is a kludge, we need to ask the server.. (see init function above)
b61c5c4484f8 - applied overlay patch by Jens H
atmosfear
parents: 384
diff changeset
770 return 1;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
771 }
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
772 return 0;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
773 */
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
774
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
775 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
776
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
777 static void uninit(void)
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
778 {
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
779 int i;
5203
2f5ff1968d1c hotfix (i doubt it will really fix this issue) by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents: 5006
diff changeset
780 if(!mDisplay) return;
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4307
diff changeset
781 saver_on(mDisplay); // screen saver back on
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
782 if(vo_config_count) for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
783 #ifdef HAVE_XF86VM
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
784 vo_vm_close(mDisplay);
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
785 #endif
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
786 if(vo_config_count) vo_x11_uninit(mDisplay, vo_window);
322
4e69a8e2700a Screensaver and monitor powersafe function is switched off when playing a
laaz
parents: 249
diff changeset
787 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
788
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
789 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
790 {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
791 XvPortID xv_p;
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
792 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
793 {
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
794 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
795 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
796 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
797 if (!vo_init()) return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
798
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
799 xv_port = 0;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
800 /* check for Xvideo extension */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
801 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
802 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
803 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
804 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
805 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
806
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
807 /* check for Xvideo support */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
808 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
809 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
810 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
811 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
812
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
813 /* check adaptors */
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
814 for (i = 0; i < adaptors && xv_port == 0; i++){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
815 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
816 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
817 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) {
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
818 xv_port = xv_p;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
819 break;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
820 } else {
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
821 mp_msg(MSGT_VO,MSGL_ERR,"Xv: could not grab port %i\n", (int)xv_p);
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
822 }
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
823 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
824 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
825 if(!xv_port){
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
826 mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it\n");
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
827 return -1;
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
828 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
829
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
830 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
831
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
832 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
833 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
834
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
835 static void query_vaa(vo_vaa_t *vaa)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
836 {
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
837 memset(vaa,0,sizeof(vo_vaa_t));
4396
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
838 vaa->get_video_eq = xv_get_video_eq;
a07b7233930b Support for HW equalizing through VAA
nick
parents: 4352
diff changeset
839 vaa->set_video_eq = xv_set_video_eq;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
840 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
841
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
842 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
843 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
844 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
845 case VOCTRL_QUERY_VAA:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
846 query_vaa((vo_vaa_t*)data);
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
847 return VO_TRUE;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
848 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
849 return query_format(*((uint32_t*)data));
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
850 case VOCTRL_GET_IMAGE:
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
851 return get_image(data);
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
852 case VOCTRL_FULLSCREEN:
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
853 vo_x11_fullscreen();
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4980
diff changeset
854 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
855 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
856 return VO_NOTIMPL;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
857 }