annotate libvo/vo_xv.c @ 4629:745a40983b36

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