Mercurial > mplayer.hg
annotate libvo/vo_svga.c @ 32309:f0247fec1cd7
100l fix if condition
author | bcoudurier |
---|---|
date | Mon, 27 Sep 2010 23:47:54 +0000 |
parents | e12d7b8e3835 |
children | 09dd92639e7b |
rev | line source |
---|---|
285 | 1 /* |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
2 * video driver for SVGAlib |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
3 * by Zoltan Mark Vician <se7en@sch.bme.hu> |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
4 * Code started: Mon Apr 1 23:25:47 2001 |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
5 * Some changes by Matan Ziv-Av <matan@svgalib.org> |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
6 * complete rewrite by Ivan Kalvachev 19 Mar 2003 |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
7 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
8 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
9 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
10 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
11 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
12 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
13 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
14 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
15 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
18 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
19 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
20 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
21 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
22 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
23 */ |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
24 |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
26755
diff
changeset
|
25 /* |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
26 Wrangings: |
28646 | 27 - 1bpp doesn't work right for me with '-double' and svgalib 1.4.3, |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
28 but works OK with svgalib 1.9.17 |
28646 | 29 - The HW acceleration is not tested - svgalibs supports few chipsets, |
30 and i don't have any of them. If it works for you then let me know. | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
31 I will remove this warning after confirm its status. |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
32 - retrace sync works only in doublebuffer mode. |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
33 - the retrace sync may slow down decoding a lot - mplayer is blocked while |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
34 waiting for retrace |
9659 | 35 - denoise3d fails to find common colorspace, use -vf denoise3d,scale |
28646 | 36 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
37 TODO: |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
38 - let choose_best_mode take aspect into account |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
39 - set palette from mpi->palette or mpi->plane[1] |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
40 - make faster OSD black bars clear - need some OSD changes |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
41 - Make nicer CONFIG parsing |
28646 | 42 - change video mode logical width to match img->stride[0] - for HW only |
285 | 43 */ |
44 | |
45 #include <stdio.h> | |
46 #include <stdlib.h> | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7124
diff
changeset
|
47 #include <string.h> |
285 | 48 |
49 #include <vga.h> | |
50 | |
485 | 51 #include <limits.h> |
52 | |
285 | 53 #include "config.h" |
54 #include "video_out.h" | |
55 #include "video_out_internal.h" | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
56 #include "fastmemcpy.h" |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
57 #include "osdep/getch2.h" |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
58 #include "vosub_vidix.h" |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
59 |
616 | 60 #include "sub.h" |
61 | |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
11565
diff
changeset
|
62 #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:
17932
diff
changeset
|
63 #include "help_mp.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
11565
diff
changeset
|
64 //#include "mp_image.h" |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
65 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
66 #include <assert.h> |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
67 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
68 //silence warnings, probably it have to go in some global header |
28646 | 69 #define UNUSED(x) ((void)(x)) |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
70 |
407 | 71 |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
72 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
73 unsigned char *srca, int stride); |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
74 static uint32_t get_image(mp_image_t *mpi); |
285 | 75 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
76 #define MAXPAGES 16 |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
77 #define PAGE_EMPTY 0 |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
78 #define PAGE_BUSY 1 |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
79 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
80 #define CAP_ACCEL_CLEAR 8 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
81 #define CAP_ACCEL_PUTIMAGE 4 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
82 #define CAP_ACCEL_BACKGR 2 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
83 #define CAP_LINEAR 1 |
285 | 84 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
85 static uint8_t zerobuf[8192];//used when clear screen with vga_draw |
285 | 86 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
87 static int squarepix; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
88 static int force_vm=0; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
89 static int force_native=0; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
90 static int sync_flip=0; |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
91 static int blackbar_osd=0; |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
92 static int cpage,max_pages,old_page; |
447 | 93 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
94 static vga_modeinfo * modeinfo; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
95 static int mode_stride; //keep it in case of vga_setlogicalwidth |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
96 static int stride_granularity; //not yet used |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
97 static int mode_bpp; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
98 static int mode_capabilities; |
483 | 99 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
100 static int image_width,image_height; // used by OSD |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
101 static int x_pos, y_pos; |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
102 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
103 static struct { |
28649 | 104 int yoffset;//y position of the page |
105 int doffset;//display start of the page | |
106 uint8_t * vbase;//memory start address of the page | |
107 int locks; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
108 }PageStore[MAXPAGES]; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
109 |
25216 | 110 static const vo_info_t info = { |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
111 "SVGAlib", |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
112 "svga", |
10940 | 113 "Ivan Kalvachev <iive@users.sf.net>", |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
114 "" |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
115 }; |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
116 |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
117 #ifdef CONFIG_VIDIX |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
118 static char vidix_name[32] = ""; |
11158
85f4534d1edb
Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents:
11000
diff
changeset
|
119 static vidix_grkey_t gr_key; |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
120 #endif |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
121 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7691
diff
changeset
|
122 LIBVO_EXTERN(svga) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7691
diff
changeset
|
123 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
124 |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
125 //return number of 1'st free page or -1 if no free one |
22886 | 126 static inline int page_find_free(void){ |
28649 | 127 int i; |
128 for(i=0;i<max_pages;i++) | |
129 if(PageStore[i].locks == PAGE_EMPTY) return i; | |
130 return -1; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
131 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
132 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
133 static int preinit(const char *arg) |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
134 { |
28649 | 135 int i,rez; |
136 char s[64]; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
137 |
28649 | 138 getch2_disable(); |
139 memset(zerobuf,0,sizeof(zerobuf)); | |
140 force_vm=force_native=squarepix=0; | |
141 sync_flip=vo_vsync; | |
142 blackbar_osd=0; | |
28646 | 143 |
28649 | 144 if(arg)while(*arg) { |
28646 | 145 #ifdef CONFIG_VIDIX |
28649 | 146 if(memcmp(arg,"vidix",5)==0) { |
147 i=6; | |
148 while(arg[i] && arg[i]!=':') i++; | |
149 strncpy(vidix_name, arg+6, i-6); | |
150 vidix_name[i-5]=0; | |
151 if(arg[i]==':')i++; | |
152 arg+=i; | |
153 vidix_preinit(vidix_name, &video_out_svga); | |
154 } | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
155 #endif |
28649 | 156 if(!strncmp(arg,"sq",2)) { |
157 squarepix=1; | |
158 arg+=2; | |
159 if( *arg == ':' ) arg++; | |
160 } | |
161 | |
162 if(!strncmp(arg,"native",6)) { | |
163 force_native=1; | |
164 arg+=6; | |
165 if( *arg == ':' ) arg++; | |
166 } | |
167 | |
168 if(!strncmp(arg,"bbosd",5)) { | |
169 blackbar_osd=1; | |
170 arg+=5; | |
171 if( *arg == ':' ) arg++; | |
172 } | |
28646 | 173 |
28649 | 174 if(!strncmp(arg,"retrace",7)) { |
175 sync_flip=1; | |
176 arg+=7; | |
177 if( *arg == ':' ) arg++; | |
178 } | |
179 | |
180 if(*arg) { | |
181 i=0; | |
182 while(arg[i] && arg[i]!=':')i++; | |
183 if(i<64){ | |
184 strncpy(s, arg, i); | |
185 s[i]=0; | |
186 | |
187 force_vm=vga_getmodenumber(s); | |
188 if(force_vm>0) { | |
189 mp_msg(MSGT_VO,MSGL_V, "vo_svga: Forcing mode %i\n",force_vm); | |
190 }else{ | |
191 force_vm = 0; | |
192 } | |
193 } | |
194 arg+=i; | |
195 if(*arg==':')arg++; | |
196 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
197 } |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
198 |
28649 | 199 rez = vga_init(); |
200 if(rez != 0){ | |
201 mp_msg(MSGT_VO,MSGL_ERR, "vo_svga: vga_init() returned error=%d\n",rez); | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
202 } |
28649 | 203 return !!rez; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
204 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
205 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
206 static void svga_clear_box(int x,int y,int w,int h){ |
28649 | 207 uint8_t * rgbplane; |
208 int i; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
209 |
28649 | 210 if (mode_capabilities&CAP_ACCEL_CLEAR){ |
211 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with HW acceleration\n", | |
212 x,y,w,h); | |
213 if(mode_capabilities&CAP_ACCEL_BACKGR) | |
214 vga_accel(ACCEL_SYNC); | |
215 vga_accel(ACCEL_SETFGCOLOR,0);//black | |
216 vga_accel(ACCEL_FILLBOX,x,y,w,h); | |
217 return; | |
218 } | |
219 if (mode_capabilities & CAP_LINEAR){ | |
220 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with memset\n",x,y,w,h); | |
221 rgbplane=PageStore[0].vbase + (y*mode_stride) + (x*modeinfo->bytesperpixel); | |
222 for(i=0;i<h;i++){ | |
223 //i'm afraid that memcpy is better optimized than memset;) | |
224 fast_memcpy(rgbplane,zerobuf,w*modeinfo->bytesperpixel); | |
225 // memset(rgbplane,0,w*modeinfo->bytesperpixel); | |
226 rgbplane+=mode_stride; | |
227 } | |
228 return; | |
229 } | |
230 //native | |
231 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with native draw \n",x,y,w,h); | |
232 if(modeinfo->bytesperpixel!=0) w*=modeinfo->bytesperpixel; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
233 for(i=0;i<h;i++){ |
28649 | 234 vga_drawscansegment(zerobuf,x,y+i,w); |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
235 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
236 }; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
237 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
238 static uint32_t svga_draw_image(mp_image_t *mpi){ |
28649 | 239 int i,x,y,w,h; |
240 int stride; | |
241 uint8_t *rgbplane, *base; | |
242 int bytesperline; | |
243 int page; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
244 |
28649 | 245 if(mpi->flags & MP_IMGFLAG_DIRECT){ |
246 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: drawing direct rendered surface\n"); | |
247 cpage=(uint32_t)mpi->priv; | |
248 assert((cpage>=0)&&(cpage<max_pages)); | |
249 return VO_TRUE; //it's already done | |
250 } | |
28646 | 251 // if (mpi->flags&MP_IMGFLAGS_DRAWBACK) |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
252 // return VO_TRUE;//direct render method 2 |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
253 |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
254 //find a free page to draw into |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
255 //if there is no one then use the current one |
28649 | 256 page = page_find_free(); |
257 if(page>=0) cpage=page; | |
258 PageStore[cpage].locks=PAGE_BUSY; | |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
259 |
28646 | 260 // these variables are used in loops |
28649 | 261 x = mpi->x; |
262 y = mpi->y; | |
263 w = mpi->w; | |
264 h = mpi->h; | |
265 stride = mpi->stride[0]; | |
266 rgbplane = mpi->planes[0] + y*stride + (x*mpi->bpp)/8; | |
267 x+=x_pos;//center | |
268 y+=y_pos; | |
28646 | 269 |
28649 | 270 if(mpi->bpp >= 8){//for modes<8 use only native |
271 if( (mode_capabilities&CAP_ACCEL_PUTIMAGE) && (x==0) && (w==mpi->width) && | |
272 (stride == mode_stride) ){ //only monolite image can be accelerated | |
273 w=(stride*8)/mpi->bpp;//we transfer pixels in the stride so the source | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
274 //ACCELERATE |
28649 | 275 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: using HW PutImage (x=%d,y=%d,w=%d,h=%d)\n",x,y,w,h); |
276 if(mode_capabilities & CAP_ACCEL_BACKGR) | |
277 vga_accel(ACCEL_SYNC); | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
278 |
28649 | 279 vga_accel(ACCEL_PUTIMAGE,x,y+PageStore[cpage].yoffset,w,h,rgbplane); |
280 return VO_TRUE; | |
281 } | |
28646 | 282 |
28649 | 283 if( mode_capabilities&CAP_LINEAR){ |
28646 | 284 //DIRECT |
28649 | 285 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: using Direct memcpy (x=%d,y=%d,w=%d,h=%d)\n",x,y,w,h); |
286 bytesperline=(w*mpi->bpp)/8; | |
287 base=PageStore[cpage].vbase + (y*mode_stride) + (x*mpi->bpp)/8; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
288 |
28649 | 289 for(i=0;i<h;i++){ |
290 mem2agpcpy(base,rgbplane,bytesperline); | |
291 base+=mode_stride; | |
292 rgbplane+=stride; | |
293 } | |
294 return VO_TRUE; | |
295 } | |
296 }//(modebpp>=8 | |
28646 | 297 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
298 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
299 //NATIVE |
28649 | 300 { |
301 int length; | |
302 length=(w*mpi->bpp)/8; | |
303 //one byte per pixel! svgalib innovation | |
304 if(mpi->imgfmt==IMGFMT_RG4B || mpi->imgfmt==IMGFMT_BG4B) length=w; | |
28646 | 305 |
28649 | 306 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: using Native vga_draw(x=%d,y=%d,w=%d,h=%d)\n",x,y,w,h); |
307 y+=PageStore[cpage].yoffset;//y position of the page beggining | |
308 for(i=0;i<h;i++){ | |
309 vga_drawscansegment(rgbplane,x,y+i,length); | |
310 rgbplane+=stride; | |
311 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
312 } |
28649 | 313 return VO_TRUE; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
314 } |
7675 | 315 |
18950 | 316 static int bpp_from_vminfo(vga_modeinfo *vminfo){ |
28649 | 317 switch(vminfo->colors){ |
318 case 2: return 1; | |
319 case 16: return 4; | |
320 case 256: return 8; | |
321 case 32768: return 15; | |
322 case 65536: return 16; | |
323 case 1<<24: return 8*vminfo->bytesperpixel; | |
324 } | |
325 return 0; | |
483 | 326 } |
327 | |
18950 | 328 static int find_best_svga_mode(int req_w,int req_h, int req_bpp){ |
28649 | 329 int badness,prev_badness; |
330 int bestmode,lastmode; | |
331 int i; | |
332 vga_modeinfo *vminfo; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
333 //int best aspect mode // best linear mode // best normal mode (no modeX) |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
334 |
28649 | 335 prev_badness = 0;//take care of special case below |
336 bestmode = 0; //0 is the TEXT mode | |
337 lastmode = vga_lastmodenumber(); | |
338 for(i=1;i<=lastmode;i++){ | |
339 vminfo = vga_getmodeinfo(i); | |
340 if( vminfo == NULL ) continue; | |
341 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: testing mode %d (%s)\n",i,vga_getmodename(i)); | |
342 if( vga_hasmode(i) == 0 ) continue; | |
343 if( req_bpp != bpp_from_vminfo(vminfo) )continue; | |
344 if( (vminfo->width < req_w) || (vminfo->height < req_h) ) continue; | |
345 badness=(vminfo->width * vminfo->height) - (req_h * req_w); | |
346 //put here aspect calculations | |
347 if(squarepix) | |
348 if( vminfo->width*3 != vminfo->height*4 ) continue; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
349 |
28649 | 350 if( bestmode==0 || prev_badness >= badness ){//modeX etc... |
351 prev_badness=badness; | |
352 bestmode=i; | |
353 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: found good mode %d with badness %d\n",i,badness); | |
354 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
355 } |
28649 | 356 return bestmode; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
357 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
358 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
359 static int control(uint32_t request, void *data, ...) |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
360 { |
28649 | 361 switch (request) { |
362 case VOCTRL_QUERY_FORMAT: | |
363 return query_format(*((uint32_t*)data)); | |
364 case VOCTRL_DRAW_IMAGE: | |
365 return svga_draw_image( (mp_image_t *)data); | |
366 case VOCTRL_GET_IMAGE: | |
367 return get_image(data); | |
368 } | |
11565
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
369 |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
370 #ifdef CONFIG_VIDIX |
28649 | 371 if (vidix_name[0]) { |
372 switch (request) { | |
373 case VOCTRL_SET_EQUALIZER: | |
374 { | |
375 va_list ap; | |
376 int value; | |
377 | |
378 va_start(ap, data); | |
379 value = va_arg(ap, int); | |
380 va_end(ap); | |
28646 | 381 |
28649 | 382 return vidix_control(request, data, value); |
383 } | |
384 case VOCTRL_GET_EQUALIZER: | |
385 { | |
386 va_list ap; | |
387 int *value; | |
11565
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
388 |
28649 | 389 va_start(ap, data); |
390 value = va_arg(ap, int*); | |
391 va_end(ap); | |
392 | |
393 return vidix_control(request, data, value); | |
394 } | |
395 } | |
396 return vidix_control(request, data); | |
11565
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
397 } |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
398 #endif |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
399 |
28649 | 400 return VO_NOTIMPL; |
285 | 401 } |
402 | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
403 // |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
404 // This function is called to init the video driver for specific mode |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
405 // |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
406 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13865
diff
changeset
|
407 uint32_t d_height, uint32_t flags, char *title, |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
408 uint32_t format) { |
28649 | 409 int32_t req_w = width;// (d_width > 0 ? d_width : width); |
410 int32_t req_h = height;// (d_height > 0 ? d_height : height); | |
411 uint16_t vid_mode = 0; | |
412 int32_t req_bpp; | |
28646 | 413 |
28649 | 414 uint32_t accflags; |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
415 mp_msg(MSGT_VO,MSGL_V, "vo_svga: config(%i, %i, %i, %i, %08x, %s, %08x)\n", width, height, |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
416 d_width, d_height, flags, title, format); |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
417 //Only RGB modes supported |
28649 | 418 if (!IMGFMT_IS_RGB(format) && !IMGFMT_IS_BGR(format)) {assert(0);return -1;} |
419 req_bpp = IMGFMT_BGR_DEPTH(format); | |
28646 | 420 |
28649 | 421 if( vo_dbpp!=0 && vo_dbpp!=req_bpp) {assert(0);return-1;} |
28646 | 422 |
28649 | 423 if(!force_vm) { |
424 mp_msg(MSGT_VO,MSGL_V, "vo_svga: Looking for the best resolution...\n"); | |
425 mp_msg(MSGT_VO,MSGL_V, "vo_svga: req_w: %d, req_h: %d, bpp: %d\n",req_w,req_h,req_bpp); | |
426 vid_mode=find_best_svga_mode(req_w,req_h,req_bpp); | |
427 if(vid_mode==0) | |
428 return 1; | |
429 modeinfo=vga_getmodeinfo(vid_mode); | |
430 }else{//force_vm | |
431 vid_mode=force_vm; | |
432 if(vga_hasmode(vid_mode) == 0){ | |
433 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_ForcedVidmodeNotAvailable, | |
434 vid_mode,vga_getmodename(vid_mode)); | |
435 return 1; //error; | |
436 } | |
437 modeinfo=vga_getmodeinfo(vid_mode); | |
438 if( (modeinfo->width < req_w) || (modeinfo->height < req_h) ){ | |
439 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_ForcedVidmodeTooSmall, | |
440 vid_mode,vga_getmodename(vid_mode)); | |
441 return 1; | |
442 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
443 } |
28649 | 444 mode_bpp=bpp_from_vminfo(modeinfo); |
28646 | 445 |
28649 | 446 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_Vidmode, |
447 vid_mode,modeinfo->width,modeinfo->height,mode_bpp); | |
28646 | 448 |
28649 | 449 if (vga_setmode(vid_mode) == -1) { |
450 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_VgasetmodeFailed,vid_mode); | |
451 uninit(); | |
452 return 1; // error | |
453 } | |
454 /* set 332 palette for 8 bpp */ | |
455 if(mode_bpp==8){ | |
456 int i; | |
457 for(i=0; i<256; i++) | |
458 vga_setpalette(i, ((i>>5)&7)*9, ((i>>2)&7)*9, (i&3)*21); | |
459 } | |
460 /* set 121 palette for 4 bpp */ | |
461 else if(mode_bpp==4){ | |
462 int i; | |
463 for(i=0; i<16; i++) | |
464 vga_setpalette(i, ((i>>3)&1)*63, ((i>>1)&3)*21, (i&1)*63); | |
465 } | |
466 //if we change the logical width, we should know the granularity | |
467 stride_granularity=8;//according to man vga_logicalwidth | |
468 if(modeinfo->flags & EXT_INFO_AVAILABLE){ | |
469 stride_granularity=modeinfo->linewidth_unit; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
470 } |
28649 | 471 //look for hardware acceleration |
472 mode_capabilities=0;//NATIVE; | |
473 if(!force_native){//if we want to use only native drawers | |
474 if(modeinfo->flags & HAVE_EXT_SET){//support for hwaccel interface | |
475 accflags=vga_ext_set(VGA_EXT_AVAILABLE,VGA_AVAIL_ACCEL); | |
476 if(accflags & ACCELFLAG_FILLBOX) // clear screen | |
477 mode_capabilities|=CAP_ACCEL_CLEAR; | |
478 if(accflags & ACCELFLAG_PUTIMAGE)//support for mem->vid transfer | |
479 mode_capabilities|=CAP_ACCEL_PUTIMAGE; | |
480 if((accflags & ACCELFLAG_SETMODE) && (accflags & ACCELFLAG_SYNC)){ | |
481 vga_accel(ACCEL_SETMODE,BLITS_IN_BACKGROUND); | |
482 mode_capabilities|=CAP_ACCEL_BACKGR;//can draw in backgraund | |
483 } | |
484 } | |
485 if(modeinfo->flags & IS_LINEAR){ | |
486 mode_capabilities|=CAP_LINEAR; //don't use bank & vga_draw | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
487 } |
28649 | 488 else{ |
489 if(modeinfo->flags & CAPABLE_LINEAR){ | |
490 int vid_mem_size; | |
491 vid_mem_size = vga_setlinearaddressing(); | |
492 if(vid_mem_size != -1){ | |
493 modeinfo=vga_getmodeinfo(vid_mode);//sometimes they change parameters | |
494 mode_capabilities|=CAP_LINEAR; | |
495 } | |
496 } | |
497 } | |
498 }//fi force native | |
499 if(mode_capabilities&CAP_LINEAR){ | |
500 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_VideoModeIsLinearAndMemcpyCouldBeUsed); | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
501 } |
28649 | 502 if(mode_capabilities&CAP_ACCEL_PUTIMAGE){ |
503 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_VideoModeHasHardwareAcceleration); | |
504 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_IfItWorksForYouIWouldLikeToKnow); | |
505 } | |
28646 | 506 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
507 //here is the place to handle strides for accel_ modes; |
28649 | 508 mode_stride=modeinfo->linewidth; |
28646 | 509 //we may try to set a bigger stride for video mode that will match the mpi->stride, |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
510 //this way we will transfer more data, but HW put_image can do it in backgraund! |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
511 |
28646 | 512 //now let's see how many pages we can use |
28649 | 513 max_pages = modeinfo->maxpixels/(modeinfo->height * modeinfo->width); |
514 if(max_pages > MAXPAGES) max_pages = MAXPAGES; | |
515 if(!vo_doublebuffering) max_pages=1; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
516 //fill PageStore structs |
28649 | 517 { |
518 int i; | |
519 uint8_t * GRAPH_MEM; | |
520 int dof; | |
521 GRAPH_MEM=vga_getgraphmem(); | |
522 for(i=0;i<max_pages;i++){ | |
523 //calculate display offset | |
524 dof = i * modeinfo->height * modeinfo->width; | |
525 if(modeinfo->bytesperpixel != 0) dof*=modeinfo->bytesperpixel; | |
526 //check video chip limitations | |
527 if( dof != (dof & modeinfo->startaddressrange) ){ | |
528 max_pages=i;//page 0 will never come here | |
529 break; | |
530 } | |
531 PageStore[i].yoffset = i * modeinfo->height;//starting y offset | |
532 PageStore[i].vbase = GRAPH_MEM + i*modeinfo->height*mode_stride; //memory base address | |
533 PageStore[i].doffset = dof; //display offset | |
534 PageStore[i].locks = PAGE_EMPTY; | |
535 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
536 } |
28649 | 537 assert(max_pages>0); |
538 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_VideoModeHas,max_pages); | |
539 //15bpp | |
540 if(modeinfo->bytesperpixel!=0) | |
541 vga_claimvideomemory(max_pages * modeinfo->height * modeinfo->width * modeinfo->bytesperpixel); | |
542 else | |
543 vga_claimvideomemory(max_pages * modeinfo->height * modeinfo->width * mode_bpp / 8); | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
544 |
28649 | 545 cpage=old_page=0; |
546 svga_clear_box(0,0,modeinfo->width,modeinfo->height * max_pages); | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
547 |
28649 | 548 image_height=req_h; |
549 image_width=req_w; | |
550 x_pos = (modeinfo->width - req_w) / 2; | |
551 y_pos = (modeinfo->height - req_h) / 2; | |
552 x_pos &= ~(15); //align x offset position to 16 pixels | |
553 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_CenteringImageStartAt,x_pos,y_pos); | |
8520 | 554 |
555 #ifdef CONFIG_VIDIX | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
556 |
28649 | 557 if(vidix_name[0]){ |
558 vidix_init(width, height, x_pos, y_pos, modeinfo->width, modeinfo->height, | |
559 format, mode_bpp, modeinfo->width,modeinfo->height); | |
560 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_UsingVidix,width,height, | |
561 modeinfo->width,modeinfo->height); | |
562 vidix_start(); | |
563 /*set colorkey*/ | |
564 if(vidix_grkey_support()){ | |
565 vidix_grkey_get(&gr_key); | |
566 gr_key.key_op = KEYS_PUT; | |
567 if (!(vo_colorkey & 0xFF000000)) { | |
568 gr_key.ckey.op = CKEY_TRUE; | |
569 gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16; | |
570 gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8; | |
571 gr_key.ckey.blue = vo_colorkey & 0x000000FF; | |
572 } else | |
573 gr_key.ckey.op = CKEY_FALSE; | |
574 vidix_grkey_set(&gr_key); | |
575 } | |
28646 | 576 } |
577 #endif | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
578 |
28649 | 579 vga_setdisplaystart(0); |
580 return 0; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
581 } |
6456 | 582 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
583 static int draw_slice(uint8_t *image[],int stride[], |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
584 int w, int h, int x, int y) { |
28649 | 585 assert(0); |
586 UNUSED(image);UNUSED(stride); | |
587 UNUSED(w);UNUSED(h); | |
588 UNUSED(x);UNUSED(y); | |
285 | 589 |
28649 | 590 return VO_ERROR;//this is yv12 only -> vf_scale should do all transforms |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
591 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
592 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
593 static int draw_frame(uint8_t *src[]) { |
28649 | 594 assert(0); |
595 UNUSED(src); | |
596 return VO_ERROR;//this one should not be called | |
285 | 597 } |
598 | |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
599 static void draw_osd(void) |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
600 { |
28649 | 601 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: draw_osd()\n"); |
602 //only modes with bytesperpixel>0 can draw OSD | |
603 if(modeinfo->bytesperpixel==0) return; | |
604 if(!(mode_capabilities&CAP_LINEAR)) return;//force_native will remove OSD | |
28646 | 605 |
28649 | 606 if(blackbar_osd){ |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
607 //111 |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
608 //3 4 |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
609 //222 |
28649 | 610 svga_clear_box(0,0 + PageStore[cpage].yoffset, |
611 modeinfo->width, y_pos); | |
612 svga_clear_box(0, image_height + y_pos + PageStore[cpage].yoffset, | |
613 modeinfo->width, modeinfo->height-(image_height+ y_pos)); | |
614 svga_clear_box(0, y_pos + PageStore[cpage].yoffset, | |
615 x_pos, image_height); | |
616 svga_clear_box(image_width + x_pos, y_pos + PageStore[cpage].yoffset, | |
617 modeinfo->width-(x_pos+image_width), image_height); | |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
618 // vo_remove_text(modeinfo->width, modeinfo->height, clear_alpha); |
28649 | 619 vo_draw_text(modeinfo->width, modeinfo->height, draw_alpha); |
620 }else{ | |
621 vo_draw_text(image_width, image_height, draw_alpha); | |
622 } | |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
623 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
624 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
625 static void flip_page(void) { |
28649 | 626 PageStore[old_page].locks=PAGE_EMPTY; |
627 PageStore[cpage].locks=PAGE_BUSY; | |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
628 |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
629 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: viewing page %d\n",cpage); |
28649 | 630 if(sync_flip && old_page!=cpage){ |
631 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga:vga_waitretrace\n"); | |
632 vga_waitretrace(); | |
633 } | |
634 vga_setdisplaystart(PageStore[cpage].doffset); | |
28646 | 635 |
28649 | 636 old_page=cpage;//cpage will be overwriten on next draw_image |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
637 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
638 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
639 static void check_events(void) { |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
640 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
641 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
642 static void uninit(void) { |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
643 |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
644 #ifdef CONFIG_VIDIX |
28649 | 645 if(vidix_name[0])vidix_term(); |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
646 #endif |
28649 | 647 vga_setmode(TEXT); |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
648 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
649 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
650 /* --------------------------------------------------------------------- */ |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
651 static int query_format(uint32_t format) { |
28649 | 652 int32_t req_bpp,flags; |
653 int i,lastmode; | |
654 vga_modeinfo * vminfo; | |
407 | 655 |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
656 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: query_format=%X \n",format); |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
657 //only RGB modes supported |
28649 | 658 if( (!IMGFMT_IS_RGB(format)) && (!IMGFMT_IS_BGR(format)) ) return 0; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
659 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
660 // Reject different endian |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
28649
diff
changeset
|
661 #if HAVE_BIGENDIAN |
28649 | 662 if (IMGFMT_IS_BGR(format)) return 0; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
663 #else |
28649 | 664 if (IMGFMT_IS_RGB(format)) return 0; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
665 #endif |
485 | 666 |
28649 | 667 //svgalib supports only BG4B! if we want BGR4 we have to emulate it (sw) |
668 if( format==IMGFMT_BGR4 || format==IMGFMT_RGB4) return 0; | |
669 req_bpp = IMGFMT_RGB_DEPTH(format); | |
670 if( vo_dbpp>0 && vo_dbpp!=req_bpp ) return 0; //support -bpp options | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
671 //scan all modes |
28649 | 672 lastmode = vga_lastmodenumber(); |
673 for(i=1;i<=lastmode;i++){ | |
674 vminfo = vga_getmodeinfo(i); | |
675 if( vminfo == NULL ) continue; | |
676 if( vga_hasmode(i) == 0 ) continue; | |
677 if( req_bpp != bpp_from_vminfo(vminfo) ) continue; | |
678 if( (force_vm > 0) && (force_vm != i) ) continue;//quick hack | |
679 flags = VFCAP_CSP_SUPPORTED| | |
680 VFCAP_CSP_SUPPORTED_BY_HW| | |
681 VFCAP_ACCEPT_STRIDE| | |
682 0; | |
683 if(req_bpp>8) flags|=VFCAP_OSD; | |
684 return flags; | |
685 } | |
686 return 0; | |
285 | 687 } |
688 | |
689 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, | |
690 unsigned char *srca, int stride) { | |
28649 | 691 char* base; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
692 |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
693 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: draw_alpha(x0=%d,y0=%d,w=%d,h=%d,src=%p,srca=%p,stride=%d\n", |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
694 x0,y0,w,h,src,srca,stride); |
28649 | 695 if(!blackbar_osd) { |
696 //drawing in the image, so place the stuff there | |
697 x0+=x_pos; | |
698 y0+=y_pos; | |
699 } | |
28646 | 700 |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
701 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: OSD draw in page %d\n",cpage); |
28649 | 702 base=PageStore[cpage].vbase + y0*mode_stride + x0*modeinfo->bytesperpixel; |
703 switch (mode_bpp) { | |
704 case 32: | |
705 vo_draw_alpha_rgb32(w, h, src, srca, stride, base, mode_stride); | |
706 break; | |
707 case 24: | |
708 vo_draw_alpha_rgb24(w, h, src, srca, stride, base, mode_stride); | |
709 break; | |
710 case 16: | |
711 vo_draw_alpha_rgb16(w, h, src, srca, stride, base, mode_stride); | |
712 break; | |
713 case 15: | |
714 vo_draw_alpha_rgb15(w, h, src, srca, stride, base, mode_stride); | |
715 break; | |
716 } | |
285 | 717 } |
4352 | 718 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
719 static uint32_t get_image(mp_image_t *mpi){ |
28649 | 720 int page; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
721 |
28649 | 722 if(!IMGFMT_IS_BGR(mpi->imgfmt) && !IMGFMT_IS_RGB(mpi->imgfmt) ){ |
723 assert(0);//should never happen | |
724 return VO_FALSE; | |
725 } | |
28646 | 726 |
28649 | 727 if ( |
728 ( (mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) || | |
729 (mpi->flags & MP_IMGFLAG_PLANAR) || | |
730 (mpi->flags & MP_IMGFLAG_YUV) | |
731 ) | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26174
diff
changeset
|
732 return VO_FALSE; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
733 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
734 //reading from video memory is horribly slow |
28649 | 735 if( !(mpi->flags & MP_IMGFLAG_READABLE) && vo_directrendering && |
736 (mode_capabilities & CAP_LINEAR) ){ | |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
737 |
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
738 //find free page and reserve it |
28649 | 739 page=page_find_free(); |
740 if(page >= 0){ | |
741 PageStore[page].locks=PAGE_BUSY; | |
10924
f531971e44cf
blackbar osd support based on patch send by Dimitar Zhekov <jimmy@is-vn.bg>, page code removed/merged, small updates
iive
parents:
9788
diff
changeset
|
742 |
28649 | 743 mpi->flags |= MP_IMGFLAG_DIRECT; |
744 mpi->stride[0] = mode_stride; | |
745 mpi->planes[0] = PageStore[page].vbase + | |
746 y_pos*mode_stride + (x_pos*mpi->bpp)/8; | |
747 mpi->priv=(void *)page; | |
748 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: direct render allocated! page=%d\n",page); | |
749 return VO_TRUE; | |
750 } | |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
751 } |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
752 |
28649 | 753 return VO_FALSE; |
4352 | 754 } |