annotate libvo/mga_template.c @ 36920:40ad45360c8a

Replace old item 'potmeter' by new item 'pimage'. Recent versions of the X11/GTK GUI didn't allow to control a potmeter, because that didn't seem to make any sense. In order to get rid of the confusing potmeter that doesn't distinguish from a hpotmeter and in order to allow the more useful behaviour recent versions of the X11/GTK GUI have been utilized (and because we're still supporting item 'potmeter' for reasons of compatibility with old skins), introduce new item 'pimage' that reuses most of the current potmeter code. Additionally, remove remaining code and documentation of 'potmeter'.
author ib
date Mon, 17 Mar 2014 12:29:46 +0000
parents 871778a75acc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
1 /*
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
2 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
5 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
7 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
8 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
12 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
13 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
14 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28232
diff changeset
17 */
413
7785656abf11 fastmemcpy added
arpi_esp
parents: 326
diff changeset
18
566
0375ced94bd7 ehh fixed ;)
arpi_esp
parents: 470
diff changeset
19 #include "fastmemcpy.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
20 #include "cpudetect.h"
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
21 #include "libmpcodecs/vf.h"
18861
8579acff875e Move postproc ---> libswscale
lucabe
parents: 18815
diff changeset
22 #include "libswscale/swscale.h"
32833
c4891d10ddbb Adjust #include paths after the merge of libavcore into libavutil in FFmpeg.
diego
parents: 32375
diff changeset
23 #include "libavutil/imgutils.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
24 #include "libmpcodecs/vf_scale.h"
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
25 #include "mp_msg.h"
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
26 #include "help_mp.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 // mga_vid drawing functions
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
29 static void set_window( void ); /* forward declaration to kill warnings */
6335
e9bd97d5c5cc warning & newline fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 6311
diff changeset
30 #ifdef VO_XMGA
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
31 static void mDrawColorKey( void ); /* forward declaration to kill warnings */
6335
e9bd97d5c5cc warning & newline fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 6311
diff changeset
32 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
34 static int mga_next_frame=0;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
35
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
36 static mga_vid_config_t mga_vid_config;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
37 static uint8_t *vid_data, *frames[4];
5389
7296c4262457 quick hack to make vo_mga accept multiple calls to config
rfelker
parents: 5335
diff changeset
38 static int f = -1;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
39
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8017
diff changeset
40 static uint32_t drwX,drwY,drwWidth,drwHeight;
32367
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
41 static uint32_t drwcX,drwcY;
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
42
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
43 static struct SwsContext *sws_ctx;
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
44
202
6ad0715dfac8 grey+alpha rendering support (for .sub)
arpi_esp
parents: 56
diff changeset
45 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
46 uint32_t bespitch = FFALIGN(mga_vid_config.src_width, 32);
9994
275766100443 fix panscan font resizing with vo_mga
rfelker
parents: 9727
diff changeset
47 x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
466
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
48 switch(mga_vid_config.format){
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
49 case MGA_VID_FORMAT_YV12:
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 466
diff changeset
50 case MGA_VID_FORMAT_IYUV:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 466
diff changeset
51 case MGA_VID_FORMAT_I420:
326
f6b5c2dbc88e OSD alpha renderers moved to osd.c
arpi_esp
parents: 284
diff changeset
52 vo_draw_alpha_yv12(w,h,src,srca,stride,vid_data+bespitch*y0+x0,bespitch);
466
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
53 break;
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
54 case MGA_VID_FORMAT_YUY2:
326
f6b5c2dbc88e OSD alpha renderers moved to osd.c
arpi_esp
parents: 284
diff changeset
55 vo_draw_alpha_yuy2(w,h,src,srca,stride,vid_data+2*(bespitch*y0+x0),2*bespitch);
466
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
56 break;
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
57 case MGA_VID_FORMAT_UYVY:
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
58 vo_draw_alpha_yuy2(w,h,src,srca,stride,vid_data+2*(bespitch*y0+x0)+1,2*bespitch);
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
59 break;
c7c03bf70bb7 UYVY support
arpi_esp
parents: 448
diff changeset
60 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
63 static void draw_osd(void)
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
64 {
9994
275766100443 fix panscan font resizing with vo_mga
rfelker
parents: 9727
diff changeset
65 // vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
275766100443 fix panscan font resizing with vo_mga
rfelker
parents: 9727
diff changeset
66 vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha);
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
67 }
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
68
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
69
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 {
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
73 uint32_t bespitch = FFALIGN(mga_vid_config.src_width, 32);
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
74 int dst_stride[4] = { bespitch, bespitch };
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
75 uint8_t *dst[4];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
77 av_image_fill_pointers(dst, PIX_FMT_NV12, mga_vid_config.src_height,
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
78 vid_data, dst_stride);
5405
c7455d4079ae using interleaveBytes() for G200 draw_slice
arpi
parents: 5389
diff changeset
79
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
80 sws_scale(sws_ctx, image, stride, y, height, dst, dst_stride);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 draw_slice_g400(uint8_t *image[], int stride[], int w,int h,int x,int y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 uint8_t *dest;
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
87 uint8_t *dest2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 uint32_t bespitch,bespitch2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
90 bespitch = FFALIGN(mga_vid_config.src_width, 32);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 bespitch2 = bespitch/2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 dest = vid_data + bespitch * y + x;
4949
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
94 mem2agpcpy_pic(dest, image[0], w, h, bespitch, stride[0]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
95
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 w/=2;h/=2;x/=2;y/=2;
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
97
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98 dest = vid_data + bespitch*mga_vid_config.src_height + bespitch2 * y + x;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
99 dest2= dest + bespitch2*mga_vid_config.src_height / 2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
101 if(mga_vid_config.format==MGA_VID_FORMAT_YV12){
32375
cbf877922fee Spelling fix.
reimar
parents: 32374
diff changeset
102 // mga_vid's YV12 assumes Y,U,V order (instead of Y,V,U) :(
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
103 mem2agpcpy_pic(dest, image[1], w, h, bespitch2, stride[1]);
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
104 mem2agpcpy_pic(dest2,image[2], w, h, bespitch2, stride[2]);
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
105 } else {
4949
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
106 mem2agpcpy_pic(dest, image[2], w, h, bespitch2, stride[2]);
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
107 mem2agpcpy_pic(dest2,image[1], w, h, bespitch2, stride[1]);
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
108 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
112 static int
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
113 draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 {
4949
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
115
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
116 #if 0
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
117 printf("vo: %p/%d %p/%d %p/%d %dx%d/%d;%d \n",
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
118 src[0],stride[0],
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
119 src[1],stride[1],
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
120 src[2],stride[2],
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
121 w,h,x,y);
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
122 #endif
48bfd1d278d1 using mem2agpcpy_pic()
arpi
parents: 2625
diff changeset
123
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 if (mga_vid_config.card_type == MGA_G200)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 draw_slice_g200(src,stride,w,h,x,y);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 draw_slice_g400(src,stride,w,h,x,y);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131 static void
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
132 vo_mga_flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 {
47
9d68da5d8a9a vsync in mga/xmga
arpi_esp
parents: 31
diff changeset
134
9d68da5d8a9a vsync in mga/xmga
arpi_esp
parents: 31
diff changeset
135 // printf("-- flip to %d --\n",mga_next_frame);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136
47
9d68da5d8a9a vsync in mga/xmga
arpi_esp
parents: 31
diff changeset
137 ioctl(f,MGA_VID_FSEL,&mga_next_frame);
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
138 mga_next_frame=(mga_next_frame+1)%mga_vid_config.num_frames;
47
9d68da5d8a9a vsync in mga/xmga
arpi_esp
parents: 31
diff changeset
139 vid_data=frames[mga_next_frame];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
140
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142
7681
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
143 static uint32_t get_image(mp_image_t *mpi){
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
144 uint32_t bespitch = FFALIGN(mga_vid_config.src_width, 32);
4971
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
145 uint32_t bespitch2 = bespitch/2;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
146 // printf("mga: get_image() called\n");
4975
877f0f643fef accept STATIC buffers if num_buffers==1
arpi
parents: 4971
diff changeset
147 if(mpi->type==MP_IMGTYPE_STATIC && mga_vid_config.num_frames>1) return VO_FALSE; // it is not static
4971
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
148 if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
5335
da218aa7f9db disabel DR and UV swapping for g200 planar modes
arpi
parents: 5317
diff changeset
149 if(mga_vid_config.card_type == MGA_G200 && mpi->flags&MP_IMGFLAG_PLANAR) return VO_FALSE;
4971
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
150 // printf("width=%d vs. bespitch=%d, flags=0x%X \n",mpi->width,bespitch,mpi->flags);
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
151 if((mpi->width==bespitch) ||
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
152 (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH))){
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
153 // we're lucky or codec accepts stride => ok, let's go!
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
154 if(mpi->flags&MP_IMGFLAG_PLANAR){
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
155 mpi->planes[0]=vid_data;
5317
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
156 if(mpi->flags&MP_IMGFLAG_SWAPPED){
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
157 mpi->planes[1]=vid_data + bespitch*mga_vid_config.src_height;
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
158 mpi->planes[2]=mpi->planes[1] + bespitch2*mga_vid_config.src_height/2;
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
159 } else {
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
160 mpi->planes[2]=vid_data + bespitch*mga_vid_config.src_height;
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
161 mpi->planes[1]=mpi->planes[2] + bespitch2*mga_vid_config.src_height/2;
80fbb03b385a U,V plane odrer fixed
arpi
parents: 5014
diff changeset
162 }
4971
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
163 mpi->width=mpi->stride[0]=bespitch;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
164 mpi->stride[1]=mpi->stride[2]=bespitch2;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
165 } else {
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
166 mpi->planes[0]=vid_data;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
167 mpi->width=bespitch;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
168 mpi->stride[0]=mpi->width*(mpi->bpp/8);
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
169 }
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
170 mpi->flags|=MP_IMGFLAG_DIRECT;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
171 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
172 return VO_TRUE;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
173 }
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
174 return VO_FALSE;
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
175 }
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
176
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
177 static uint32_t
7681
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
178 draw_image(mp_image_t *mpi){
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
179 uint32_t bespitch = FFALIGN(mga_vid_config.src_width, 32);
7681
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
180
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
181 // if -dr or -slices then do nothing:
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
182 if(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK)) return VO_TRUE;
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
183
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
184 if(mpi->flags&MP_IMGFLAG_PLANAR){
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
185 // copy planar:
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
186 draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
187 } else {
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
188 // copy packed:
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
189 mem2agpcpy_pic(vid_data, mpi->planes[0], // dst,src
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
190 mpi->w*(mpi->bpp/8), mpi->h, // w,h
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
191 bespitch*2, mpi->stride[0]); // dstride,sstride
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
192 }
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
193 return VO_TRUE;
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
194 }
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
195
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
196 static int
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 query_format(uint32_t format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 switch(format){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200 case IMGFMT_YV12:
470
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 466
diff changeset
201 case IMGFMT_I420:
8e101a5d9dc2 I420/IYUV support
arpi_esp
parents: 466
diff changeset
202 case IMGFMT_IYUV:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 case IMGFMT_YUY2:
448
198b46b739d8 qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
arpi_esp
parents: 413
diff changeset
204 case IMGFMT_UYVY:
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13787
diff changeset
205 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
209
24241
e6c56a194610 warning fix:
diego
parents: 24233
diff changeset
210 #ifndef VO_XMGA
28232
8df85ad26746 Add missing 'void' keyword to parameterless function declarations.
diego
parents: 28088
diff changeset
211 static void mga_fullscreen(void)
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
212 {
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
213 uint32_t w,h;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
214 if ( !vo_fs ) {
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
215 vo_fs=VO_TRUE;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
216 w=vo_screenwidth; h=vo_screenheight;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
217 aspect(&w,&h,A_ZOOM);
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
218 } else {
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
219 vo_fs=VO_FALSE;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
220 w=vo_dwidth; h=vo_dheight;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
221 aspect(&w,&h,A_NOZOOM);
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
222 }
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
223 mga_vid_config.dest_width = w;
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
224 mga_vid_config.dest_height= h;
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
225 mga_vid_config.x_org=(vo_screenwidth-w)/2;
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
226 mga_vid_config.y_org=(vo_screenheight-h)/2;
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
227 if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
228 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_ErrorInConfigIoctl );
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
229 }
24241
e6c56a194610 warning fix:
diego
parents: 24233
diff changeset
230 #endif
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
231
33305
ddb45e9443ec Remove the variable arguments from the libvo control() functions.
iive
parents: 33301
diff changeset
232 static int control(uint32_t request, void *data)
4970
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
233 {
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
234 switch (request) {
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
235 case VOCTRL_QUERY_FORMAT:
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
236 return query_format(*((uint32_t*)data));
4971
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
237 case VOCTRL_GET_IMAGE:
fa002f25631e direct rendering support
arpi
parents: 4970
diff changeset
238 return get_image(data);
7681
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
239 case VOCTRL_DRAW_IMAGE:
62be493f77c3 draw_image() implementation (new libvo API)
arpi
parents: 7680
diff changeset
240 return draw_image(data);
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
241 case VOCTRL_SET_EQUALIZER:
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
242 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
243 vf_equalizer_t *eq=data;
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
244 short value;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
245 uint32_t luma,prev;
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
246
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
247 if ( strcmp( eq->item,"brightness" ) && strcmp( eq->item,"contrast" ) ) return VO_FALSE;
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
248
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
249 if (ioctl(f,MGA_VID_GET_LUMA,&prev)) {
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
250 perror("Error in mga_vid_config ioctl()");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
251 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_CouldNotGetLumaValuesFromTheKernelModule);
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
252 return VO_FALSE;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
253 }
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
254
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
255 // printf("GET: 0x%4X 0x%4X \n",(prev>>16),(prev&0xffff));
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
256
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
257 // printf("value: %d -> ",eq->value);
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
258 value=((eq->value+100)*255)/200-128; // maps -100=>-128 and +100=>127
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
259 // printf("%d \n",value);
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
260
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
261 if(!strcmp(data,"contrast"))
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
262 luma = (prev&0xFFFF0000)|(value&0xFFFF);
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
263 else
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
264 luma = (prev&0xFFFF)|(value<<16);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
265
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
266 if (ioctl(f,MGA_VID_SET_LUMA,luma)) {
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
267 perror("Error in mga_vid_config ioctl()");
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
268 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_CouldNotSetLumaValuesFromTheKernelModule);
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
269 return VO_FALSE;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
270 }
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
271
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
272 return VO_TRUE;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
273 }
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
274
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
275 case VOCTRL_GET_EQUALIZER:
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
276 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
277 vf_equalizer_t *eq=data;
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
278 short val;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
279 uint32_t luma;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
280
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
281 if ( strcmp( eq->item,"brightness" ) && strcmp( eq->item,"contrast" ) ) return VO_FALSE;
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
282
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
283 if (ioctl(f,MGA_VID_GET_LUMA,&luma)) {
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
284 perror("Error in mga_vid_config ioctl()");
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
285 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_CouldNotGetLumaValuesFromTheKernelModule);
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
286 return VO_FALSE;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
287 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
288
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
289 if ( !strcmp( eq->item,"contrast" ) )
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
290 val=(luma & 0xFFFF);
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
291 else
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
292 val=(luma >> 16);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
293
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32833
diff changeset
294 eq->value = (val*200)/255;
6799
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
295
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
296 return VO_TRUE;
60a7886834af eq fixed, based on patch by .so
arpi
parents: 6755
diff changeset
297 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
298
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
299 #ifndef VO_XMGA
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
300 case VOCTRL_FULLSCREEN:
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
301 if (vo_screenwidth && vo_screenheight)
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
302 mga_fullscreen();
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
303 else
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
304 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_ScreenWidthHeightUnknown);
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
305 return VO_TRUE;
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
306 case VOCTRL_GET_PANSCAN:
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
307 if ( !vo_fs ) return VO_FALSE;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
308 return VO_TRUE;
5987
08c552788216 fullscreen toggle for vo_mga
rfelker
parents: 5607
diff changeset
309 #endif
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
310
36870
871778a75acc Remove condition.
ib
parents: 36517
diff changeset
311 #if defined(VO_XMGA)
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5987
diff changeset
312 case VOCTRL_GUISUPPORT:
bb1f3552f118 wm detection -- round two
pontscho
parents: 5987
diff changeset
313 return VO_TRUE;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5987
diff changeset
314 #endif
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
315
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
316 #ifdef VO_XMGA
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10233
diff changeset
317 case VOCTRL_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10233
diff changeset
318 vo_x11_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10233
diff changeset
319 return VO_TRUE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
320 case VOCTRL_GET_PANSCAN:
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 24424
diff changeset
321 if ( !initialized || !vo_fs ) return VO_FALSE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
322 return VO_TRUE;
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
323 case VOCTRL_FULLSCREEN:
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
324 vo_x11_fullscreen();
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
325 vo_panscan_amount=0;
32373
67c00c59eba6 Spelling fix.
reimar
parents: 32367
diff changeset
326 /* intended, fallthrough to update panscan on fullscreen/windowed switch */
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
327 #endif
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
328 case VOCTRL_SET_PANSCAN:
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
329 if ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) // || ( !vo_fs && vo_panscan_amount ) )
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
330 {
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8017
diff changeset
331 // int old_y = vo_panscan_y;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
332 panscan_calc();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
333 // if ( old_y != vo_panscan_y )
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6335
diff changeset
334 set_window();
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
335 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6009
diff changeset
336 return VO_TRUE;
32367
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
337 case VOCTRL_UPDATE_SCREENINFO:
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
338 #ifdef VO_XMGA
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
339 update_xinerama_info();
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
340 #else
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
341 aspect_save_screenres(vo_screenwidth, vo_screenheight);
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
342 #endif
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
343 return VO_TRUE;
4970
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
344 }
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
345 return VO_NOTIMPL;
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
346 }
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
347
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
348
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
349 static int mga_init(int width,int height,unsigned int format){
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
350
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
351 uint32_t bespitch = FFALIGN(width, 32);
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
352 switch(format){
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
353 case IMGFMT_YV12:
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
354 width = FFALIGN(width, 2);
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
355 height = FFALIGN(height, 2);
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
356 mga_vid_config.frame_size = bespitch * height + (bespitch * height) / 2;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
357 mga_vid_config.format=MGA_VID_FORMAT_I420; break;
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
358 case IMGFMT_I420:
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
359 case IMGFMT_IYUV:
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
360 width = FFALIGN(width, 2);
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
361 height = FFALIGN(height, 2);
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
362 mga_vid_config.frame_size = bespitch * height + (bespitch * height) / 2;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
363 mga_vid_config.format=MGA_VID_FORMAT_YV12; break;
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
364 case IMGFMT_YUY2:
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
365 mga_vid_config.frame_size = bespitch * height * 2;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
366 mga_vid_config.format=MGA_VID_FORMAT_YUY2; break;
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
367 case IMGFMT_UYVY:
32374
40bb8aa55f55 Use FFALIGN macro.
reimar
parents: 32373
diff changeset
368 mga_vid_config.frame_size = bespitch * height * 2;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
369 mga_vid_config.format=MGA_VID_FORMAT_UYVY; break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
370 default:
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
371 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_InvalidOutputFormat,format);
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
372 return -1;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
373 }
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
374
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
375 mga_vid_config.src_width = width;
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
376 mga_vid_config.src_height= height;
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
377 if(!mga_vid_config.dest_width)
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
378 mga_vid_config.dest_width = width;
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
379 if(!mga_vid_config.dest_height)
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
380 mga_vid_config.dest_height= height;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
381
7680
d60cfb1f8b37 more cleanup, some -vo mga fullscreen fixes
arpi
parents: 7679
diff changeset
382 mga_vid_config.colkey_on=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
383
5432
0c5025974a83 use only 1 buffers if dr=yes and double=no
arpi
parents: 5406
diff changeset
384 mga_vid_config.num_frames=(vo_directrendering && !vo_doublebuffering)?1:3;
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
385 mga_vid_config.version=MGA_VID_VERSION;
22693
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
386
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
387 if(width > 1024 && height > 1024)
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
388 {
28088
5e0b35277554 Fix MGSTR vs. MSGTR typo.
diego
parents: 27377
diff changeset
389 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_MGA_ResolutionTooHigh);
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
390 return -1;
22693
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
391 } else if(height <= 1024)
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
392 {
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
393 // try whether we have a G550
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
394 int ret;
24424
0c4f1a88eaae warning fixes:
diego
parents: 24321
diff changeset
395 if ((ret = ioctl(f,MGA_VID_CONFIG,&mga_vid_config)))
22693
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
396 {
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
397 if(mga_vid_config.card_type != MGA_G550)
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
398 {
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
399 // we don't have a G550, so our resolution is too high
28088
5e0b35277554 Fix MGSTR vs. MSGTR typo.
diego
parents: 27377
diff changeset
400 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_MGA_ResolutionTooHigh);
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
401 return -1;
22693
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
402 } else {
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
403 // there is a deeper problem
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
404 // we have a G550, but still couldn't configure mga_vid
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
405 perror("Error in mga_vid_config ioctl()");
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
406 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_IncompatibleDriverVersion);
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
407 return -1;
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
408 }
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
409 // if we arrived here, then we could successfully configure mga_vid
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
410 // at this high resolution
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
411 }
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
412 } else {
22694
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
413 // configure mga_vid in case resolution is < 1024x1024 too
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
414 if (ioctl(f,MGA_VID_CONFIG,&mga_vid_config))
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
415 {
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
416 perror("Error in mga_vid_config ioctl()");
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
417 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_IncompatibleDriverVersion);
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
418 return -1;
595f9fb80827 cosmetics, fix indentation
attila
parents: 22693
diff changeset
419 }
22693
b73dca7dbb0f allow horizontal resolutions >1024 in case we have a G550
attila
parents: 22142
diff changeset
420 }
31371
a6cb957ad186 Disable only G200 support when compiling against dynamic libswscale instead
reimar
parents: 31364
diff changeset
421 if (mga_vid_config.card_type == MGA_G200) {
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
422 sws_ctx = sws_getContext(width, height, PIX_FMT_YUV420P,
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
423 width, height, PIX_FMT_NV12,
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
424 SWS_BILINEAR, NULL, NULL, NULL);
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
425 if (!sws_ctx) {
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
426 mp_msg(MSGT_VO, MSGL_FATAL,
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
427 "Could not get swscale context to scale for G200.\n");
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
428 return -1;
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
429 }
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
430 mp_msg(MSGT_VO, MSGL_WARN, "G200 cards support is untested. "
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
431 "Please report whether it works.\n");
31371
a6cb957ad186 Disable only G200 support when compiling against dynamic libswscale instead
reimar
parents: 31364
diff changeset
432 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
433
24321
cec4585b904b Move debug message to verbose output level.
diego
parents: 24241
diff changeset
434 mp_msg(MSGT_VO,MSGL_V,"[MGA] Using %d buffers.\n",mga_vid_config.num_frames);
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
435
33712
2d193c9affc7 Remove pointless and in addition incorrect cast.
reimar
parents: 33305
diff changeset
436 frames[0] = mmap(0,mga_vid_config.frame_size*mga_vid_config.num_frames,PROT_WRITE,MAP_SHARED,f,0);
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
437 frames[1] = frames[0] + 1*mga_vid_config.frame_size;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
438 frames[2] = frames[0] + 2*mga_vid_config.frame_size;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
439 frames[3] = frames[0] + 3*mga_vid_config.frame_size;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
440 mga_next_frame = 0;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
441 vid_data = frames[mga_next_frame];
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
442
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
443 //clear the buffer
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
444 memset(frames[0],0x80,mga_vid_config.frame_size*mga_vid_config.num_frames);
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
445
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7695
diff changeset
446 #ifndef VO_XMGA
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
447 ioctl(f,MGA_VID_ON,0);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7695
diff changeset
448 #endif
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
449
56
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
450 return 0;
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
451 }
cdb2e30be421 mga_vid fixes, code cleanup
arpi_esp
parents: 47
diff changeset
452
29212
eda346733b8c Add missing 'void' to parameterless function declarations.
diego
parents: 28446
diff changeset
453 static int mga_uninit(void){
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
454 if(f>=0){
1637
248972c26eee fixed mga uninit
arpi
parents: 566
diff changeset
455 ioctl( f,MGA_VID_OFF,0 );
248972c26eee fixed mga uninit
arpi
parents: 566
diff changeset
456 munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
248972c26eee fixed mga uninit
arpi
parents: 566
diff changeset
457 close(f);
5389
7296c4262457 quick hack to make vo_mga accept multiple calls to config
rfelker
parents: 5335
diff changeset
458 f = -1;
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
459 }
32196
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
460 if (sws_ctx) {
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
461 sws_freeContext(sws_ctx);
56ce48514a75 mga: use libswscale interface for g200 (untested)
ramiro
parents: 32027
diff changeset
462 }
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 6799
diff changeset
463 return 0;
1637
248972c26eee fixed mga uninit
arpi
parents: 566
diff changeset
464 }
4970
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
465
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
466 static int preinit(const char *vo_subdevice)
4970
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
467 {
26831
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
468 uint32_t ver;
7695
368d333d92c2 compiler warning found by Dominik
arpi
parents: 7694
diff changeset
469 const char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
5433
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
470
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
471 f = open(devname,O_RDWR);
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
472 if(f == -1)
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
473 {
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
474 perror("open");
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 16171
diff changeset
475 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_CouldntOpen,devname);
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
476 return -1;
5433
d596cf3c54aa open(/dev/mga_vid) moved to preinit
arpi
parents: 5432
diff changeset
477 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
478
26831
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
479 // check whether the mga_vid driver has the same
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
480 // version as we expect
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29212
diff changeset
481
26831
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
482 ioctl(f,MGA_VID_GET_VERSION,&ver);
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
483 if(MGA_VID_VERSION != ver)
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
484 {
28088
5e0b35277554 Fix MGSTR vs. MSGTR typo.
diego
parents: 27377
diff changeset
485 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_MGA_mgavidVersionMismatch, ver, MGA_VID_VERSION);
26831
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
486 return -1;
7b868c55d22b make use of the new MGA_VID_VERSION ioctl to check
attila
parents: 26755
diff changeset
487 }
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
488
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
489 #ifdef VO_XMGA
8778
ff92d9b5ade5 don't keep mga_vid device open if x11 init fails (fixes "-vo xmga,mga")
rfelker
parents: 8123
diff changeset
490 if (!vo_init()) {
ff92d9b5ade5 don't keep mga_vid device open if x11 init fails (fixes "-vo xmga,mga")
rfelker
parents: 8123
diff changeset
491 close(f);
ff92d9b5ade5 don't keep mga_vid device open if x11 init fails (fixes "-vo xmga,mga")
rfelker
parents: 8123
diff changeset
492 return -1;
ff92d9b5ade5 don't keep mga_vid device open if x11 init fails (fixes "-vo xmga,mga")
rfelker
parents: 8123
diff changeset
493 }
7679
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
494 #endif
e4e70b0e1786 some cleanup
arpi
parents: 7676
diff changeset
495
4970
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
496 return 0;
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
497 }
f21d15f0cba6 control+preinit moved to mga_common.c
arpi
parents: 4949
diff changeset
498
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
499 static void set_window( void ){
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
500
32367
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
501 drwcX = vo_dx;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
502 drwcY = vo_dy;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
503 drwWidth = vo_dwidth;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
504 drwHeight = vo_dheight;
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
505
32367
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
506 aspect(&drwWidth, &drwHeight, A_WINZOOM);
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
507 panscan_calc_windowed();
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
508 drwWidth += vo_panscan_x;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
509 drwHeight += vo_panscan_y;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
510 drwWidth = FFMIN(drwWidth, vo_screenwidth);
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
511 drwHeight = FFMIN(drwHeight, vo_screenheight);
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
512 drwX = (vo_dwidth - drwWidth ) / 2;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
513 drwY = (vo_dheight - drwHeight) / 2;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
514 drwcX += drwX;
4a890f542e69 Switch (x)mga vo to new libvo API to reduce code duplication and improve
reimar
parents: 32196
diff changeset
515 drwcY += drwY;
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
516
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
517 #ifdef VO_XMGA
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
518 #ifdef CONFIG_XINERAMA
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
519 if(XineramaIsActive(mDisplay))
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
520 {
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
521 XineramaScreenInfo *screens;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
522 int num_screens;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
523 int i;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
524
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
525 screens = XineramaQueryScreens(mDisplay,&num_screens);
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
526
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
527 /* find the screen we are on */
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
528 i = 0;
8988
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
529 while(i<num_screens &&
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
530 ((screens[i].x_org < drwcX) ||
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
531 (screens[i].y_org < drwcY) ||
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
532 (screens[i].x_org + screens[i].width >= drwcX) ||
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
533 (screens[i].y_org + screens[i].height >= drwcY)))
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
534 {
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
535 i++;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
536 }
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
537
8988
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
538 if(i<num_screens)
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
539 {
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
540 /* save the screen we are on */
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
541 xinerama_screen = i;
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
542 } else {
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
543 /* oops.. couldnt find the screen we are on
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
544 * because the upper left corner left the
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
545 * visual range. assume we are still on the
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
546 * same screen
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
547 */
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
548 i = xinerama_screen;
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
549 }
3b328492f94d xinerama fix part 1
attila
parents: 8778
diff changeset
550
24233
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
551 if(xinerama_screen == -1)
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
552 {
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
553 // The default value of the xinerama_screen is
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
554 // still there. Which means we could never
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
555 // figure out on which screen we are.
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
556 // Choose the first screen as default
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
557 xinerama_screen = i = 0;
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
558 }
28dcfa978bad Assume first xinerama screen, in case xmga could
attila
parents: 23617
diff changeset
559
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
560 /* set drwcX and drwcY to the right values */
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
561 drwcX = drwcX - screens[i].x_org;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
562 drwcY = drwcY - screens[i].y_org;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
563 XFree(screens);
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
564 }
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
565
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
566 #endif
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
567
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
568 mDrawColorKey();
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
569 #endif
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
570
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
571 mga_vid_config.x_org=drwcX;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
572 mga_vid_config.y_org=drwcY;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
573 mga_vid_config.dest_width=drwWidth;
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
574 mga_vid_config.dest_height=drwHeight;
9047
8c3d54868366 fix xmga + playbar
pontscho
parents: 8988
diff changeset
575 if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) mp_msg(MSGT_VO,MSGL_WARN,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
8017
a57aac3a927a panscan support in -vo mga (actually moved common code to mga_common.c)
arpi
parents: 7777
diff changeset
576 }