annotate libvo/vo_xv.c @ 6743:5c6cc735c946

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