Mercurial > mplayer.hg
annotate libvo/vesa_lvo.c @ 32229:e7cd36fc291e
Do not falsely declare some vo_functions_t declarations as const.
Also add a comment so this mistake is not repeated.
author | diego |
---|---|
date | Mon, 20 Sep 2010 07:33:53 +0000 |
parents | 0a81c931ecb5 |
children | 09dd92639e7b |
rev | line source |
---|---|
2869 | 1 /* |
27509
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
2 * vo_vesa interface to Linux Video Overlay |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
3 * (partly based on vo_mga.c) |
2869 | 4 * |
27509
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
5 * copyright (C) 2001 Nick Kurshev <nickols_k@mail.ru> |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
6 * |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
7 * This file is part of MPlayer. |
2869 | 8 * |
27509
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
9 * MPlayer is free software; you can redistribute it and/or modify |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
10 * it under the terms of the GNU General Public License as published by |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
11 * the Free Software Foundation; either version 2 of the License, or |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
12 * (at your option) any later version. |
2869 | 13 * |
27509
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
14 * MPlayer is distributed in the hope that it will be useful, |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
17 * GNU General Public License for more details. |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
18 * |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
19 * You should have received a copy of the GNU General Public License along |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
20 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
d97a607821f1
Replace casual GPL notices by proper license headers.
diego
parents:
25527
diff
changeset
|
21 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
2869 | 22 */ |
23 | |
24 #include <inttypes.h> | |
25 #include <sys/ioctl.h> | |
26 #include <unistd.h> | |
27 #include <fcntl.h> | |
28 #include <sys/mman.h> | |
29 #include <stdio.h> | |
30 #include <stdlib.h> | |
31 #include <string.h> | |
32 | |
3205 | 33 #include "config.h" |
17932 | 34 #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
|
35 #include "help_mp.h" |
3205 | 36 |
2869 | 37 #include "vesa_lvo.h" |
19431
ac69ba536915
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents:
18234
diff
changeset
|
38 #include "libmpcodecs/img_format.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
6817
diff
changeset
|
39 #include "drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */ |
2869 | 40 #include "fastmemcpy.h" |
3205 | 41 #include "osd.h" |
3202 | 42 #include "video_out.h" |
25518 | 43 #include "sub.h" |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
44 #include "libmpcodecs/vfcap.h" |
3202 | 45 |
3165 | 46 #define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */ |
3266
ff90589b635f
Fixed single buffering problems and -vo mga compatibility by number of buffers
nick
parents:
3205
diff
changeset
|
47 #define NUM_FRAMES 10 |
3205 | 48 #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */ |
49 | |
2869 | 50 static uint8_t *frames[NUM_FRAMES]; |
51 | |
52 static int lvo_handler = -1; | |
53 static uint8_t *lvo_mem = NULL; | |
54 static uint8_t next_frame; | |
55 static mga_vid_config_t mga_vid_config; | |
2974
49199909c939
Ugly YV12 support on Radeon BES. (Only radeon_vid currently work with this stuff :( Sorry!)
nick
parents:
2971
diff
changeset
|
56 static unsigned image_bpp,image_height,image_width,src_format; |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
57 uint32_t vlvo_control(uint32_t request, void *data, ...); |
2869 | 58 |
59 #define PIXEL_SIZE() ((video_mode_info.BitsPerPixel+7)/8) | |
60 #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) ) | |
61 #define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size)) | |
62 | |
2971 | 63 int vlvo_init(unsigned src_width,unsigned src_height, |
2869 | 64 unsigned x_org,unsigned y_org,unsigned dst_width, |
65 unsigned dst_height,unsigned format,unsigned dest_bpp) | |
66 { | |
67 size_t i,awidth; | |
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
|
68 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); |
4493 | 69 return -1; |
17932 | 70 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
71 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_init() was called\n");} |
2869 | 72 image_width = src_width; |
73 image_height = src_height; | |
74 mga_vid_config.version=MGA_VID_VERSION; | |
2974
49199909c939
Ugly YV12 support on Radeon BES. (Only radeon_vid currently work with this stuff :( Sorry!)
nick
parents:
2971
diff
changeset
|
75 src_format = mga_vid_config.format=format; |
2869 | 76 awidth = (src_width + (WIDTH_ALIGN-1)) & ~(WIDTH_ALIGN-1); |
77 switch(format){ | |
78 case IMGFMT_YV12: | |
79 case IMGFMT_I420: | |
80 case IMGFMT_IYUV: | |
81 image_bpp=16; | |
82 mga_vid_config.frame_size = awidth*src_height+(awidth*src_height)/2; | |
83 break; | |
84 case IMGFMT_YUY2: | |
85 case IMGFMT_UYVY: | |
86 image_bpp=16; | |
87 mga_vid_config.frame_size = awidth*src_height*2; | |
88 break; | |
89 case IMGFMT_RGB15: | |
90 case IMGFMT_BGR15: | |
91 case IMGFMT_RGB16: | |
92 case IMGFMT_BGR16: | |
93 image_bpp=16; | |
94 mga_vid_config.frame_size = awidth*src_height*2; | |
95 break; | |
96 case IMGFMT_RGB24: | |
97 case IMGFMT_BGR24: | |
98 image_bpp=24; | |
99 mga_vid_config.frame_size = awidth*src_height*3; | |
100 break; | |
101 case IMGFMT_RGB32: | |
102 case IMGFMT_BGR32: | |
103 image_bpp=32; | |
104 mga_vid_config.frame_size = awidth*src_height*4; | |
105 break; | |
106 default: | |
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
|
107 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_InvalidOutputFormat,vo_format_name(format),format); |
2869 | 108 return -1; |
109 } | |
110 mga_vid_config.colkey_on=0; | |
111 mga_vid_config.src_width = src_width; | |
112 mga_vid_config.src_height= src_height; | |
113 mga_vid_config.dest_width = dst_width; | |
114 mga_vid_config.dest_height= dst_height; | |
115 mga_vid_config.x_org=x_org; | |
116 mga_vid_config.y_org=y_org; | |
117 mga_vid_config.num_frames=NUM_FRAMES; | |
118 if (ioctl(lvo_handler,MGA_VID_CONFIG,&mga_vid_config)) | |
119 { | |
2971 | 120 perror("vesa_lvo: Error in mga_vid_config ioctl()"); |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
17932
diff
changeset
|
121 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_IncompatibleDriverVersion); |
2869 | 122 return -1; |
123 } | |
124 ioctl(lvo_handler,MGA_VID_ON,0); | |
125 | |
126 frames[0] = (char*)mmap(0,mga_vid_config.frame_size*mga_vid_config.num_frames,PROT_WRITE,MAP_SHARED,lvo_handler,0); | |
127 for(i=1;i<NUM_FRAMES;i++) | |
128 frames[i] = frames[i-1] + mga_vid_config.frame_size; | |
129 next_frame = 0; | |
130 lvo_mem = frames[next_frame]; | |
131 | |
132 /*clear the buffer*/ | |
133 memset(frames[0],0x80,mga_vid_config.frame_size*mga_vid_config.num_frames); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27509
diff
changeset
|
134 return 0; |
2869 | 135 } |
136 | |
137 void vlvo_term( void ) | |
138 { | |
17932 | 139 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
140 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_term() was called\n");} |
2869 | 141 ioctl( lvo_handler,MGA_VID_OFF,0 ); |
142 munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames); | |
143 if(lvo_handler != -1) close(lvo_handler); | |
144 } | |
145 | |
32202
6c9a3a4c93a7
Mark vlvo_draw_slice_420() as static, it is not used outside the file; fixes:
diego
parents:
32201
diff
changeset
|
146 static uint32_t vlvo_draw_slice_420(uint8_t *image[], int stride[], |
6c9a3a4c93a7
Mark vlvo_draw_slice_420() as static, it is not used outside the file; fixes:
diego
parents:
32201
diff
changeset
|
147 int w, int h, int x, int y) |
2869 | 148 { |
149 uint8_t *src; | |
150 uint8_t *dest; | |
3020 | 151 uint32_t bespitch,bespitch2; |
2869 | 152 int i; |
153 | |
154 bespitch = (mga_vid_config.src_width + (WIDTH_ALIGN-1)) & ~(WIDTH_ALIGN-1); | |
155 bespitch2 = bespitch/2; | |
156 | |
157 dest = lvo_mem + bespitch * y + x; | |
158 src = image[0]; | |
159 for(i=0;i<h;i++){ | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
19431
diff
changeset
|
160 fast_memcpy(dest,src,w); |
2869 | 161 src+=stride[0]; |
162 dest += bespitch; | |
163 } | |
164 | |
165 w/=2;h/=2;x/=2;y/=2; | |
166 | |
167 dest = lvo_mem + bespitch*mga_vid_config.src_height + bespitch2 * y + x; | |
168 src = image[1]; | |
169 for(i=0;i<h;i++){ | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
19431
diff
changeset
|
170 fast_memcpy(dest,src,w); |
2869 | 171 src+=stride[1]; |
172 dest += bespitch2; | |
173 } | |
174 | |
175 dest = lvo_mem + bespitch*mga_vid_config.src_height | |
176 + bespitch*mga_vid_config.src_height / 4 | |
177 + bespitch2 * y + x; | |
178 src = image[2]; | |
179 for(i=0;i<h;i++){ | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
19431
diff
changeset
|
180 fast_memcpy(dest,src,w); |
2869 | 181 src+=stride[2]; |
182 dest += bespitch2; | |
183 } | |
3020 | 184 return 0; |
185 } | |
186 | |
32204
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
187 static uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], |
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
188 int w, int h, int x, int y) |
3020 | 189 { |
17932 | 190 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
191 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_draw_slice() was called\n");} |
3165 | 192 if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) |
3202 | 193 vlvo_draw_slice_420(image,stride,w,h,x,y); |
2974
49199909c939
Ugly YV12 support on Radeon BES. (Only radeon_vid currently work with this stuff :( Sorry!)
nick
parents:
2971
diff
changeset
|
194 else |
3202 | 195 { |
196 uint8_t *dst; | |
197 uint8_t bytpp; | |
198 bytpp = (image_bpp+7)/8; | |
199 dst = lvo_mem + (image_width * y + x)*bytpp; | |
200 /* vlvo_draw_slice_422(image,stride,w,h,x,y); just for speed */ | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
19431
diff
changeset
|
201 fast_memcpy(dst,image[0],mga_vid_config.frame_size); |
3202 | 202 } |
2924 | 203 return 0; |
2869 | 204 } |
205 | |
32204
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
206 static uint32_t vlvo_draw_frame(uint8_t *image[]) |
2869 | 207 { |
3017 | 208 /* Note it's very strange but sometime for YUY2 draw_frame is called */ |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
19431
diff
changeset
|
209 fast_memcpy(lvo_mem,image[0],mga_vid_config.frame_size); |
17932 | 210 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
211 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_flip_page() was called\n");} |
3017 | 212 return 0; |
2869 | 213 } |
214 | |
32204
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
215 static void vlvo_flip_page(void) |
2869 | 216 { |
17932 | 217 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
218 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_draw_osd() was called\n");} |
3266
ff90589b635f
Fixed single buffering problems and -vo mga compatibility by number of buffers
nick
parents:
3205
diff
changeset
|
219 if(vo_doublebuffering) |
ff90589b635f
Fixed single buffering problems and -vo mga compatibility by number of buffers
nick
parents:
3205
diff
changeset
|
220 { |
2869 | 221 ioctl(lvo_handler,MGA_VID_FSEL,&next_frame); |
222 next_frame=(next_frame+1)%mga_vid_config.num_frames; | |
223 lvo_mem=frames[next_frame]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27509
diff
changeset
|
224 } |
2869 | 225 } |
226 | |
25519 | 227 #if 0 |
3205 | 228 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride) |
229 { | |
230 UNUSED(x0); | |
231 UNUSED(y0); | |
232 UNUSED(w); | |
233 UNUSED(h); | |
234 UNUSED(src); | |
235 UNUSED(srca); | |
236 UNUSED(stride); | |
237 } | |
238 | |
239 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride) | |
240 { | |
241 uint32_t bespitch = /*(*/mga_vid_config.src_width;// + 15) & ~15; | |
242 switch(mga_vid_config.format){ | |
243 case IMGFMT_BGR15: | |
244 case IMGFMT_RGB15: | |
245 vo_draw_alpha_rgb15(w,h,src,srca,stride,lvo_mem+2*(y0*bespitch+x0),2*bespitch); | |
246 break; | |
247 case IMGFMT_BGR16: | |
248 case IMGFMT_RGB16: | |
249 vo_draw_alpha_rgb16(w,h,src,srca,stride,lvo_mem+2*(y0*bespitch+x0),2*bespitch); | |
250 break; | |
251 case IMGFMT_BGR24: | |
252 case IMGFMT_RGB24: | |
253 vo_draw_alpha_rgb24(w,h,src,srca,stride,lvo_mem+3*(y0*bespitch+x0),3*bespitch); | |
254 break; | |
255 case IMGFMT_BGR32: | |
256 case IMGFMT_RGB32: | |
257 vo_draw_alpha_rgb32(w,h,src,srca,stride,lvo_mem+4*(y0*bespitch+x0),4*bespitch); | |
258 break; | |
259 case IMGFMT_YV12: | |
260 case IMGFMT_IYUV: | |
261 case IMGFMT_I420: | |
262 vo_draw_alpha_yv12(w,h,src,srca,stride,lvo_mem+bespitch*y0+x0,bespitch); | |
263 break; | |
264 case IMGFMT_YUY2: | |
265 vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+2*(bespitch*y0+x0),bespitch); | |
266 break; | |
267 case IMGFMT_UYVY: | |
268 vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+2*(bespitch*y0+x0)+1,bespitch); | |
269 break; | |
270 default: | |
271 draw_alpha_null(x0,y0,w,h,src,srca,stride); | |
272 } | |
273 } | |
25519 | 274 #endif |
3205 | 275 |
32204
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
276 static void vlvo_draw_osd(void) |
2869 | 277 { |
17932 | 278 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
279 mp_msg(MSGT_VO,MSGL_DBG2,"vesa_lvo: vlvo_draw_osd() was called\n"); } |
2869 | 280 /* TODO: hw support */ |
3205 | 281 #if 0 |
282 /* disable this stuff until new fbvid.h interface will be implemented | |
283 because in different fourcc radeon_vid and rage128_vid have different | |
284 width alignment */ | |
285 vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha); | |
286 #endif | |
2869 | 287 } |
288 | |
32203
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
289 extern vo_functions_t video_out_vesa; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
290 |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
291 int vlvo_preinit(const char *drvname) |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
292 { |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
293 mp_msg(MSGT_VO, MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
294 return -1; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
295 if (mp_msg_test(MSGT_VO, MSGL_DBG2)) { |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
296 mp_msg(MSGT_VO, MSGL_DBG2, |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
297 "vesa_lvo: vlvo_preinit(%s) was called\n", drvname); |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
298 } |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
299 lvo_handler = open(drvname,O_RDWR); |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
300 if (lvo_handler == -1) { |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
301 mp_msg(MSGT_VO, MSGL_WARN, MSGTR_LIBVO_VESA_CouldntOpen, drvname); |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
302 return -1; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
303 } |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
304 /* we are able to tune up this stuff depend on fourcc format */ |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
305 video_out_vesa.draw_slice = vlvo_draw_slice; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
306 video_out_vesa.draw_frame = vlvo_draw_frame; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
307 video_out_vesa.flip_page = vlvo_flip_page; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
308 video_out_vesa.draw_osd = vlvo_draw_osd; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
309 video_out_vesa.control = vlvo_control; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
310 return 0; |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
311 } |
42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
diego
parents:
32202
diff
changeset
|
312 |
32204
0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
diego
parents:
32203
diff
changeset
|
313 static uint32_t vlvo_query_info(uint32_t format) |
2869 | 314 { |
17932 | 315 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |
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
|
316 mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: query_format was called: %x (%s)\n",format,vo_format_name(format)); } |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
317 return VFCAP_CSP_SUPPORTED; |
2869 | 318 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
319 |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
320 uint32_t vlvo_control(uint32_t request, void *data, ...) |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
321 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
322 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
323 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
324 return vlvo_query_info(*((uint32_t*)data)); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
325 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
326 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4493
diff
changeset
|
327 } |