Mercurial > mplayer.hg
annotate libvo/vo_svga.c @ 37117:f996bcd28c23
subreader: Check the %n result variable.
This ensures we had an actual match against the
full string.
Ideally this would be possible by checking for a one larger
return value, but unfortunately the standard is unclear if
%n arguments should be counted or not...
author | reimar |
---|---|
date | Tue, 27 May 2014 19:22:12 +0000 |
parents | e788bcd9d49b |
children |
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" | |
36517 | 55 #define NO_DRAW_FRAME |
56 #define NO_DRAW_SLICE | |
285 | 57 #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
|
58 #include "fastmemcpy.h" |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
59 #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
|
60 #include "vosub_vidix.h" |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
61 |
32467 | 62 #include "sub/sub.h" |
616 | 63 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
11565
diff
changeset
|
64 #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
|
65 #include "help_mp.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
11565
diff
changeset
|
66 //#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
|
67 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
68 #include <assert.h> |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
69 |
407 | 70 |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
71 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
|
72 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
|
73 static uint32_t get_image(mp_image_t *mpi); |
285 | 74 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
75 #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
|
76 #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
|
77 #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
|
78 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
79 #define CAP_ACCEL_CLEAR 8 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
80 #define CAP_ACCEL_PUTIMAGE 4 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
81 #define CAP_ACCEL_BACKGR 2 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
82 #define CAP_LINEAR 1 |
285 | 83 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
84 static uint8_t zerobuf[8192];//used when clear screen with vga_draw |
285 | 85 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
86 static int squarepix; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
87 static int force_vm=0; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
88 static int force_native=0; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
89 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
|
90 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
|
91 static int cpage,max_pages,old_page; |
447 | 92 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
93 static vga_modeinfo * modeinfo; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
94 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
|
95 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
|
96 static int mode_bpp; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
97 static int mode_capabilities; |
483 | 98 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
99 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
|
100 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
|
101 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
102 static struct { |
28649 | 103 int yoffset;//y position of the page |
104 int doffset;//display start of the page | |
105 uint8_t * vbase;//memory start address of the page | |
106 int locks; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
107 }PageStore[MAXPAGES]; |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
108 |
25216 | 109 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
|
110 "SVGAlib", |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
111 "svga", |
10940 | 112 "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
|
113 "" |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
114 }; |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
115 |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
116 #ifdef CONFIG_VIDIX |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
117 static char vidix_name[32] = ""; |
11158
85f4534d1edb
Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents:
11000
diff
changeset
|
118 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
|
119 #endif |
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
120 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7691
diff
changeset
|
121 LIBVO_EXTERN(svga) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7691
diff
changeset
|
122 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
123 |
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
|
124 //return number of 1'st free page or -1 if no free one |
22886 | 125 static inline int page_find_free(void){ |
28649 | 126 int i; |
127 for(i=0;i<max_pages;i++) | |
128 if(PageStore[i].locks == PAGE_EMPTY) return i; | |
129 return -1; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
130 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
131 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
132 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
|
133 { |
28649 | 134 int i,rez; |
135 char s[64]; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
136 |
28649 | 137 getch2_disable(); |
138 memset(zerobuf,0,sizeof(zerobuf)); | |
139 force_vm=force_native=squarepix=0; | |
140 sync_flip=vo_vsync; | |
141 blackbar_osd=0; | |
28646 | 142 |
28649 | 143 if(arg)while(*arg) { |
28646 | 144 #ifdef CONFIG_VIDIX |
28649 | 145 if(memcmp(arg,"vidix",5)==0) { |
146 i=6; | |
147 while(arg[i] && arg[i]!=':') i++; | |
148 strncpy(vidix_name, arg+6, i-6); | |
149 vidix_name[i-5]=0; | |
150 if(arg[i]==':')i++; | |
151 arg+=i; | |
152 vidix_preinit(vidix_name, &video_out_svga); | |
153 } | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
154 #endif |
28649 | 155 if(!strncmp(arg,"sq",2)) { |
156 squarepix=1; | |
157 arg+=2; | |
158 if( *arg == ':' ) arg++; | |
159 } | |
160 | |
161 if(!strncmp(arg,"native",6)) { | |
162 force_native=1; | |
163 arg+=6; | |
164 if( *arg == ':' ) arg++; | |
165 } | |
166 | |
167 if(!strncmp(arg,"bbosd",5)) { | |
168 blackbar_osd=1; | |
169 arg+=5; | |
170 if( *arg == ':' ) arg++; | |
171 } | |
28646 | 172 |
28649 | 173 if(!strncmp(arg,"retrace",7)) { |
174 sync_flip=1; | |
175 arg+=7; | |
176 if( *arg == ':' ) arg++; | |
177 } | |
178 | |
179 if(*arg) { | |
180 i=0; | |
181 while(arg[i] && arg[i]!=':')i++; | |
182 if(i<64){ | |
183 strncpy(s, arg, i); | |
184 s[i]=0; | |
185 | |
186 force_vm=vga_getmodenumber(s); | |
187 if(force_vm>0) { | |
188 mp_msg(MSGT_VO,MSGL_V, "vo_svga: Forcing mode %i\n",force_vm); | |
189 }else{ | |
190 force_vm = 0; | |
191 } | |
192 } | |
193 arg+=i; | |
194 if(*arg==':')arg++; | |
195 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
196 } |
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
|
197 |
28649 | 198 rez = vga_init(); |
199 if(rez != 0){ | |
200 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
|
201 } |
28649 | 202 return !!rez; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
203 } |
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 static void svga_clear_box(int x,int y,int w,int h){ |
28649 | 206 uint8_t * rgbplane; |
207 int i; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
208 |
28649 | 209 if (mode_capabilities&CAP_ACCEL_CLEAR){ |
210 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with HW acceleration\n", | |
211 x,y,w,h); | |
212 if(mode_capabilities&CAP_ACCEL_BACKGR) | |
213 vga_accel(ACCEL_SYNC); | |
214 vga_accel(ACCEL_SETFGCOLOR,0);//black | |
215 vga_accel(ACCEL_FILLBOX,x,y,w,h); | |
216 return; | |
217 } | |
218 if (mode_capabilities & CAP_LINEAR){ | |
219 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with memset\n",x,y,w,h); | |
220 rgbplane=PageStore[0].vbase + (y*mode_stride) + (x*modeinfo->bytesperpixel); | |
221 for(i=0;i<h;i++){ | |
222 //i'm afraid that memcpy is better optimized than memset;) | |
223 fast_memcpy(rgbplane,zerobuf,w*modeinfo->bytesperpixel); | |
224 // memset(rgbplane,0,w*modeinfo->bytesperpixel); | |
225 rgbplane+=mode_stride; | |
226 } | |
227 return; | |
228 } | |
229 //native | |
230 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: clearing box %d,%d - %d,%d with native draw \n",x,y,w,h); | |
231 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
|
232 for(i=0;i<h;i++){ |
28649 | 233 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
|
234 } |
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 static uint32_t svga_draw_image(mp_image_t *mpi){ |
28649 | 238 int i,x,y,w,h; |
239 int stride; | |
240 uint8_t *rgbplane, *base; | |
241 int bytesperline; | |
242 int page; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
243 |
28649 | 244 if(mpi->flags & MP_IMGFLAG_DIRECT){ |
245 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: drawing direct rendered surface\n"); | |
36762 | 246 cpage=(uintptr_t)mpi->priv; |
28649 | 247 assert((cpage>=0)&&(cpage<max_pages)); |
248 return VO_TRUE; //it's already done | |
249 } | |
28646 | 250 // 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
|
251 // 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
|
252 |
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 //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
|
254 //if there is no one then use the current one |
28649 | 255 page = page_find_free(); |
256 if(page>=0) cpage=page; | |
257 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
|
258 |
28646 | 259 // these variables are used in loops |
28649 | 260 x = mpi->x; |
261 y = mpi->y; | |
262 w = mpi->w; | |
263 h = mpi->h; | |
264 stride = mpi->stride[0]; | |
265 rgbplane = mpi->planes[0] + y*stride + (x*mpi->bpp)/8; | |
266 x+=x_pos;//center | |
267 y+=y_pos; | |
28646 | 268 |
28649 | 269 if(mpi->bpp >= 8){//for modes<8 use only native |
270 if( (mode_capabilities&CAP_ACCEL_PUTIMAGE) && (x==0) && (w==mpi->width) && | |
271 (stride == mode_stride) ){ //only monolite image can be accelerated | |
272 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
|
273 //ACCELERATE |
28649 | 274 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: using HW PutImage (x=%d,y=%d,w=%d,h=%d)\n",x,y,w,h); |
275 if(mode_capabilities & CAP_ACCEL_BACKGR) | |
276 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
|
277 |
28649 | 278 vga_accel(ACCEL_PUTIMAGE,x,y+PageStore[cpage].yoffset,w,h,rgbplane); |
279 return VO_TRUE; | |
280 } | |
28646 | 281 |
28649 | 282 if( mode_capabilities&CAP_LINEAR){ |
28646 | 283 //DIRECT |
28649 | 284 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: using Direct memcpy (x=%d,y=%d,w=%d,h=%d)\n",x,y,w,h); |
285 bytesperline=(w*mpi->bpp)/8; | |
286 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
|
287 |
28649 | 288 for(i=0;i<h;i++){ |
289 mem2agpcpy(base,rgbplane,bytesperline); | |
290 base+=mode_stride; | |
291 rgbplane+=stride; | |
292 } | |
293 return VO_TRUE; | |
294 } | |
295 }//(modebpp>=8 | |
28646 | 296 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
297 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
298 //NATIVE |
28649 | 299 { |
300 int length; | |
301 length=(w*mpi->bpp)/8; | |
302 //one byte per pixel! svgalib innovation | |
303 if(mpi->imgfmt==IMGFMT_RG4B || mpi->imgfmt==IMGFMT_BG4B) length=w; | |
28646 | 304 |
28649 | 305 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); |
306 y+=PageStore[cpage].yoffset;//y position of the page beggining | |
307 for(i=0;i<h;i++){ | |
308 vga_drawscansegment(rgbplane,x,y+i,length); | |
309 rgbplane+=stride; | |
310 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
311 } |
28649 | 312 return VO_TRUE; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
313 } |
7675 | 314 |
18950 | 315 static int bpp_from_vminfo(vga_modeinfo *vminfo){ |
28649 | 316 switch(vminfo->colors){ |
317 case 2: return 1; | |
318 case 16: return 4; | |
319 case 256: return 8; | |
320 case 32768: return 15; | |
321 case 65536: return 16; | |
322 case 1<<24: return 8*vminfo->bytesperpixel; | |
323 } | |
324 return 0; | |
483 | 325 } |
326 | |
18950 | 327 static int find_best_svga_mode(int req_w,int req_h, int req_bpp){ |
28649 | 328 int badness,prev_badness; |
329 int bestmode,lastmode; | |
330 int i; | |
331 vga_modeinfo *vminfo; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
332 //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
|
333 |
28649 | 334 prev_badness = 0;//take care of special case below |
335 bestmode = 0; //0 is the TEXT mode | |
336 lastmode = vga_lastmodenumber(); | |
337 for(i=1;i<=lastmode;i++){ | |
338 vminfo = vga_getmodeinfo(i); | |
339 if( vminfo == NULL ) continue; | |
340 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: testing mode %d (%s)\n",i,vga_getmodename(i)); | |
341 if( vga_hasmode(i) == 0 ) continue; | |
342 if( req_bpp != bpp_from_vminfo(vminfo) )continue; | |
343 if( (vminfo->width < req_w) || (vminfo->height < req_h) ) continue; | |
344 badness=(vminfo->width * vminfo->height) - (req_h * req_w); | |
345 //put here aspect calculations | |
346 if(squarepix) | |
347 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
|
348 |
28649 | 349 if( bestmode==0 || prev_badness >= badness ){//modeX etc... |
350 prev_badness=badness; | |
351 bestmode=i; | |
352 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: found good mode %d with badness %d\n",i,badness); | |
353 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
354 } |
28649 | 355 return bestmode; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
356 } |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
357 |
33305
ddb45e9443ec
Remove the variable arguments from the libvo control() functions.
iive
parents:
33301
diff
changeset
|
358 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
|
359 { |
28649 | 360 switch (request) { |
361 case VOCTRL_QUERY_FORMAT: | |
362 return query_format(*((uint32_t*)data)); | |
363 case VOCTRL_DRAW_IMAGE: | |
364 return svga_draw_image( (mp_image_t *)data); | |
365 case VOCTRL_GET_IMAGE: | |
366 return get_image(data); | |
367 } | |
11565
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
368 |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
369 #ifdef CONFIG_VIDIX |
28649 | 370 if (vidix_name[0]) { |
371 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
|
372 } |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
373 #endif |
0d24c99199e2
Some more vidix crap - vidix equalizer passthrough. Patch by Oleg I. Vdovikin <vdovikin@jscc.ru>
alex
parents:
11216
diff
changeset
|
374 |
28649 | 375 return VO_NOTIMPL; |
285 | 376 } |
377 | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
378 // |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
379 // 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
|
380 // |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
381 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
|
382 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
|
383 uint32_t format) { |
28649 | 384 int32_t req_w = width;// (d_width > 0 ? d_width : width); |
385 int32_t req_h = height;// (d_height > 0 ? d_height : height); | |
386 uint16_t vid_mode = 0; | |
387 int32_t req_bpp; | |
28646 | 388 |
28649 | 389 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
|
390 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
|
391 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
|
392 //Only RGB modes supported |
28649 | 393 if (!IMGFMT_IS_RGB(format) && !IMGFMT_IS_BGR(format)) {assert(0);return -1;} |
394 req_bpp = IMGFMT_BGR_DEPTH(format); | |
28646 | 395 |
28649 | 396 if( vo_dbpp!=0 && vo_dbpp!=req_bpp) {assert(0);return-1;} |
28646 | 397 |
28649 | 398 if(!force_vm) { |
399 mp_msg(MSGT_VO,MSGL_V, "vo_svga: Looking for the best resolution...\n"); | |
400 mp_msg(MSGT_VO,MSGL_V, "vo_svga: req_w: %d, req_h: %d, bpp: %d\n",req_w,req_h,req_bpp); | |
401 vid_mode=find_best_svga_mode(req_w,req_h,req_bpp); | |
402 if(vid_mode==0) | |
403 return 1; | |
404 modeinfo=vga_getmodeinfo(vid_mode); | |
405 }else{//force_vm | |
406 vid_mode=force_vm; | |
407 if(vga_hasmode(vid_mode) == 0){ | |
408 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_ForcedVidmodeNotAvailable, | |
409 vid_mode,vga_getmodename(vid_mode)); | |
410 return 1; //error; | |
411 } | |
412 modeinfo=vga_getmodeinfo(vid_mode); | |
413 if( (modeinfo->width < req_w) || (modeinfo->height < req_h) ){ | |
414 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_ForcedVidmodeTooSmall, | |
415 vid_mode,vga_getmodename(vid_mode)); | |
416 return 1; | |
417 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
418 } |
28649 | 419 mode_bpp=bpp_from_vminfo(modeinfo); |
28646 | 420 |
28649 | 421 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_Vidmode, |
422 vid_mode,modeinfo->width,modeinfo->height,mode_bpp); | |
28646 | 423 |
28649 | 424 if (vga_setmode(vid_mode) == -1) { |
425 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SVGA_VgasetmodeFailed,vid_mode); | |
426 uninit(); | |
427 return 1; // error | |
428 } | |
429 /* set 332 palette for 8 bpp */ | |
430 if(mode_bpp==8){ | |
431 int i; | |
432 for(i=0; i<256; i++) | |
433 vga_setpalette(i, ((i>>5)&7)*9, ((i>>2)&7)*9, (i&3)*21); | |
434 } | |
435 /* set 121 palette for 4 bpp */ | |
436 else if(mode_bpp==4){ | |
437 int i; | |
438 for(i=0; i<16; i++) | |
439 vga_setpalette(i, ((i>>3)&1)*63, ((i>>1)&3)*21, (i&1)*63); | |
440 } | |
441 //if we change the logical width, we should know the granularity | |
442 stride_granularity=8;//according to man vga_logicalwidth | |
443 if(modeinfo->flags & EXT_INFO_AVAILABLE){ | |
444 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
|
445 } |
28649 | 446 //look for hardware acceleration |
447 mode_capabilities=0;//NATIVE; | |
448 if(!force_native){//if we want to use only native drawers | |
449 if(modeinfo->flags & HAVE_EXT_SET){//support for hwaccel interface | |
450 accflags=vga_ext_set(VGA_EXT_AVAILABLE,VGA_AVAIL_ACCEL); | |
451 if(accflags & ACCELFLAG_FILLBOX) // clear screen | |
452 mode_capabilities|=CAP_ACCEL_CLEAR; | |
453 if(accflags & ACCELFLAG_PUTIMAGE)//support for mem->vid transfer | |
454 mode_capabilities|=CAP_ACCEL_PUTIMAGE; | |
455 if((accflags & ACCELFLAG_SETMODE) && (accflags & ACCELFLAG_SYNC)){ | |
456 vga_accel(ACCEL_SETMODE,BLITS_IN_BACKGROUND); | |
457 mode_capabilities|=CAP_ACCEL_BACKGR;//can draw in backgraund | |
458 } | |
459 } | |
460 if(modeinfo->flags & IS_LINEAR){ | |
461 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
|
462 } |
28649 | 463 else{ |
464 if(modeinfo->flags & CAPABLE_LINEAR){ | |
465 int vid_mem_size; | |
466 vid_mem_size = vga_setlinearaddressing(); | |
467 if(vid_mem_size != -1){ | |
468 modeinfo=vga_getmodeinfo(vid_mode);//sometimes they change parameters | |
469 mode_capabilities|=CAP_LINEAR; | |
470 } | |
471 } | |
472 } | |
473 }//fi force native | |
474 if(mode_capabilities&CAP_LINEAR){ | |
475 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
|
476 } |
28649 | 477 if(mode_capabilities&CAP_ACCEL_PUTIMAGE){ |
478 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_VideoModeHasHardwareAcceleration); | |
479 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_IfItWorksForYouIWouldLikeToKnow); | |
480 } | |
28646 | 481 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
482 //here is the place to handle strides for accel_ modes; |
28649 | 483 mode_stride=modeinfo->linewidth; |
28646 | 484 //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
|
485 //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
|
486 |
28646 | 487 //now let's see how many pages we can use |
28649 | 488 max_pages = modeinfo->maxpixels/(modeinfo->height * modeinfo->width); |
489 if(max_pages > MAXPAGES) max_pages = MAXPAGES; | |
490 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
|
491 //fill PageStore structs |
28649 | 492 { |
493 int i; | |
494 uint8_t * GRAPH_MEM; | |
495 int dof; | |
496 GRAPH_MEM=vga_getgraphmem(); | |
497 for(i=0;i<max_pages;i++){ | |
498 //calculate display offset | |
499 dof = i * modeinfo->height * modeinfo->width; | |
500 if(modeinfo->bytesperpixel != 0) dof*=modeinfo->bytesperpixel; | |
501 //check video chip limitations | |
502 if( dof != (dof & modeinfo->startaddressrange) ){ | |
503 max_pages=i;//page 0 will never come here | |
504 break; | |
505 } | |
506 PageStore[i].yoffset = i * modeinfo->height;//starting y offset | |
507 PageStore[i].vbase = GRAPH_MEM + i*modeinfo->height*mode_stride; //memory base address | |
508 PageStore[i].doffset = dof; //display offset | |
509 PageStore[i].locks = PAGE_EMPTY; | |
510 } | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
511 } |
28649 | 512 assert(max_pages>0); |
513 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_VideoModeHas,max_pages); | |
514 //15bpp | |
515 if(modeinfo->bytesperpixel!=0) | |
516 vga_claimvideomemory(max_pages * modeinfo->height * modeinfo->width * modeinfo->bytesperpixel); | |
517 else | |
518 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
|
519 |
28649 | 520 cpage=old_page=0; |
521 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
|
522 |
28649 | 523 image_height=req_h; |
524 image_width=req_w; | |
525 x_pos = (modeinfo->width - req_w) / 2; | |
526 y_pos = (modeinfo->height - req_h) / 2; | |
527 x_pos &= ~(15); //align x offset position to 16 pixels | |
528 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_CenteringImageStartAt,x_pos,y_pos); | |
8520 | 529 |
530 #ifdef CONFIG_VIDIX | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
531 |
28649 | 532 if(vidix_name[0]){ |
533 vidix_init(width, height, x_pos, y_pos, modeinfo->width, modeinfo->height, | |
534 format, mode_bpp, modeinfo->width,modeinfo->height); | |
535 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SVGA_UsingVidix,width,height, | |
536 modeinfo->width,modeinfo->height); | |
537 vidix_start(); | |
538 /*set colorkey*/ | |
539 if(vidix_grkey_support()){ | |
540 vidix_grkey_get(&gr_key); | |
541 gr_key.key_op = KEYS_PUT; | |
542 if (!(vo_colorkey & 0xFF000000)) { | |
543 gr_key.ckey.op = CKEY_TRUE; | |
544 gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16; | |
545 gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8; | |
546 gr_key.ckey.blue = vo_colorkey & 0x000000FF; | |
547 } else | |
548 gr_key.ckey.op = CKEY_FALSE; | |
549 vidix_grkey_set(&gr_key); | |
550 } | |
28646 | 551 } |
552 #endif | |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
553 |
28649 | 554 vga_setdisplaystart(0); |
555 return 0; | |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
556 } |
6456 | 557 |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
558 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
|
559 { |
28649 | 560 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: draw_osd()\n"); |
561 //only modes with bytesperpixel>0 can draw OSD | |
562 if(modeinfo->bytesperpixel==0) return; | |
563 if(!(mode_capabilities&CAP_LINEAR)) return;//force_native will remove OSD | |
28646 | 564 |
28649 | 565 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
|
566 //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
|
567 //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
|
568 //222 |
28649 | 569 svga_clear_box(0,0 + PageStore[cpage].yoffset, |
570 modeinfo->width, y_pos); | |
571 svga_clear_box(0, image_height + y_pos + PageStore[cpage].yoffset, | |
572 modeinfo->width, modeinfo->height-(image_height+ y_pos)); | |
573 svga_clear_box(0, y_pos + PageStore[cpage].yoffset, | |
574 x_pos, image_height); | |
575 svga_clear_box(image_width + x_pos, y_pos + PageStore[cpage].yoffset, | |
576 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
|
577 // vo_remove_text(modeinfo->width, modeinfo->height, clear_alpha); |
28649 | 578 vo_draw_text(modeinfo->width, modeinfo->height, draw_alpha); |
579 }else{ | |
580 vo_draw_text(image_width, image_height, draw_alpha); | |
581 } | |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
582 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
583 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
584 static void flip_page(void) { |
28649 | 585 PageStore[old_page].locks=PAGE_EMPTY; |
586 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
|
587 |
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
|
588 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: viewing page %d\n",cpage); |
28649 | 589 if(sync_flip && old_page!=cpage){ |
590 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga:vga_waitretrace\n"); | |
591 vga_waitretrace(); | |
592 } | |
593 vga_setdisplaystart(PageStore[cpage].doffset); | |
28646 | 594 |
28649 | 595 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
|
596 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
597 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
598 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
|
599 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
600 |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
601 static void uninit(void) { |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
602 |
8515
b4e5d87b878b
vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
alex
parents:
8148
diff
changeset
|
603 #ifdef CONFIG_VIDIX |
28649 | 604 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
|
605 #endif |
28649 | 606 vga_setmode(TEXT); |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
607 } |
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
608 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
609 /* --------------------------------------------------------------------- */ |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15212
diff
changeset
|
610 static int query_format(uint32_t format) { |
28649 | 611 int32_t req_bpp,flags; |
612 int i,lastmode; | |
613 vga_modeinfo * vminfo; | |
407 | 614 |
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
|
615 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
|
616 //only RGB modes supported |
28649 | 617 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
|
618 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
619 // Reject different endian |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
28649
diff
changeset
|
620 #if HAVE_BIGENDIAN |
28649 | 621 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
|
622 #else |
28649 | 623 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
|
624 #endif |
485 | 625 |
28649 | 626 //svgalib supports only BG4B! if we want BGR4 we have to emulate it (sw) |
627 if( format==IMGFMT_BGR4 || format==IMGFMT_RGB4) return 0; | |
628 req_bpp = IMGFMT_RGB_DEPTH(format); | |
629 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
|
630 //scan all modes |
28649 | 631 lastmode = vga_lastmodenumber(); |
632 for(i=1;i<=lastmode;i++){ | |
633 vminfo = vga_getmodeinfo(i); | |
634 if( vminfo == NULL ) continue; | |
635 if( vga_hasmode(i) == 0 ) continue; | |
636 if( req_bpp != bpp_from_vminfo(vminfo) ) continue; | |
637 if( (force_vm > 0) && (force_vm != i) ) continue;//quick hack | |
638 flags = VFCAP_CSP_SUPPORTED| | |
639 VFCAP_CSP_SUPPORTED_BY_HW| | |
640 VFCAP_ACCEPT_STRIDE| | |
641 0; | |
642 if(req_bpp>8) flags|=VFCAP_OSD; | |
643 return flags; | |
644 } | |
645 return 0; | |
285 | 646 } |
647 | |
648 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, | |
649 unsigned char *srca, int stride) { | |
28649 | 650 char* base; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
651 |
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
|
652 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
|
653 x0,y0,w,h,src,srca,stride); |
28649 | 654 if(!blackbar_osd) { |
655 //drawing in the image, so place the stuff there | |
656 x0+=x_pos; | |
657 y0+=y_pos; | |
658 } | |
28646 | 659 |
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
|
660 mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: OSD draw in page %d\n",cpage); |
28649 | 661 base=PageStore[cpage].vbase + y0*mode_stride + x0*modeinfo->bytesperpixel; |
662 switch (mode_bpp) { | |
663 case 32: | |
664 vo_draw_alpha_rgb32(w, h, src, srca, stride, base, mode_stride); | |
665 break; | |
666 case 24: | |
667 vo_draw_alpha_rgb24(w, h, src, srca, stride, base, mode_stride); | |
668 break; | |
669 case 16: | |
670 vo_draw_alpha_rgb16(w, h, src, srca, stride, base, mode_stride); | |
671 break; | |
672 case 15: | |
673 vo_draw_alpha_rgb15(w, h, src, srca, stride, base, mode_stride); | |
674 break; | |
675 } | |
285 | 676 } |
4352 | 677 |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
678 static uint32_t get_image(mp_image_t *mpi){ |
28649 | 679 int page; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
680 |
28649 | 681 if(!IMGFMT_IS_BGR(mpi->imgfmt) && !IMGFMT_IS_RGB(mpi->imgfmt) ){ |
682 assert(0);//should never happen | |
683 return VO_FALSE; | |
684 } | |
28646 | 685 |
28649 | 686 if ( |
687 ( (mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) || | |
688 (mpi->flags & MP_IMGFLAG_PLANAR) || | |
689 (mpi->flags & MP_IMGFLAG_YUV) | |
690 ) | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26174
diff
changeset
|
691 return VO_FALSE; |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
692 |
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
693 //reading from video memory is horribly slow |
28649 | 694 if( !(mpi->flags & MP_IMGFLAG_READABLE) && vo_directrendering && |
695 (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
|
696 |
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
|
697 //find free page and reserve it |
28649 | 698 page=page_find_free(); |
699 if(page >= 0){ | |
700 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
|
701 |
28649 | 702 mpi->flags |= MP_IMGFLAG_DIRECT; |
703 mpi->stride[0] = mode_stride; | |
704 mpi->planes[0] = PageStore[page].vbase + | |
705 y_pos*mode_stride + (x_pos*mpi->bpp)/8; | |
36762 | 706 mpi->priv=(void *)(uintptr_t)page; |
28649 | 707 mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: direct render allocated! page=%d\n",page); |
708 return VO_TRUE; | |
709 } | |
5679
30f196ff3bec
This patch replaces vo_svga.c with an improved version that does not use
arpi
parents:
4596
diff
changeset
|
710 } |
9621
3ef467aac4a1
new svga driver - support double buffering, fast_memcpy, direct render and HW acceleration
iive
parents:
9237
diff
changeset
|
711 |
28649 | 712 return VO_FALSE; |
4352 | 713 } |