Mercurial > mplayer.hg
annotate libvo/vo_sdl.c @ 357:681979d4031a
- small bugfixes
author | atmosfear |
---|---|
date | Wed, 11 Apr 2001 20:11:21 +0000 |
parents | 70833462dee9 |
children | 020ca66964e4 |
rev | line source |
---|---|
1 | 1 /* |
351 | 2 * vo_sdl.c |
3 * | |
4 * (was video_out_sdl.c from OMS project) | |
1 | 5 * |
6 * Copyright (C) Ryan C. Gordon <icculus@lokigames.com> - April 22, 2000. | |
7 * | |
8 * A mpeg2dec display driver that does output through the | |
9 * Simple DirectMedia Layer (SDL) library. This effectively gives us all | |
10 * sorts of output options: X11, SVGAlib, fbcon, AAlib, GGI. Win32, MacOS | |
11 * and BeOS support, too. Yay. SDL info, source, and binaries can be found | |
12 * at http://slouken.devolution.com/SDL/ | |
13 * | |
14 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. | |
15 * | |
16 * mpeg2dec is free software; you can redistribute it and/or modify | |
17 * it under the terms of the GNU General Public License as published by | |
18 * the Free Software Foundation; either version 2, or (at your option) | |
19 * any later version. | |
20 * | |
21 * mpeg2dec is distributed in the hope that it will be useful, | |
22 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 * GNU General Public License for more details. | |
25 * | |
26 * You should have received a copy of the GNU General Public License | |
27 * along with GNU Make; see the file COPYING. If not, write to | |
28 * the Free Software Foundation, | |
29 * | |
30 * Changes: | |
31 * Dominik Schnitzer <dominik@schnitzer.at> - November 08, 2000. | |
84 | 32 * - Added resizing support, fullscreen: changed the sdlmodes selection |
1 | 33 * routine. |
34 * - SDL bugfixes: removed the atexit(SLD_Quit), SDL_Quit now resides in | |
35 * the plugin_exit routine. | |
36 * - Commented the source :) | |
37 * - Shortcuts: for switching between Fullscreen/Windowed mode and for | |
38 * cycling between the different Fullscreen modes. | |
39 * - Small bugfixes: proper width/height of movie | |
40 * Dominik Schnitzer <dominik@schnitzer.at> - November 11, 2000. | |
41 * - Cleanup code, more comments | |
42 * - Better error handling | |
43 * Bruno Barreyra <barreyra@ufl.edu> - December 10, 2000. | |
44 * - Eliminated memcpy's for entire frames | |
84 | 45 * Felix Buenemann <Felix.Buenemann@ePost.de> - March 11, 2001 |
46 * - Added aspect-ratio awareness for fullscreen | |
97
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
47 * Felix Buenemann <Felix.Buenemann@gmx.de> - March 11, 2001 |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
48 * - Fixed aspect-ratio awareness, did only vertical scaling (black bars above |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
49 * and below), now also does horizontal scaling (black bars left and right), |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
50 * so you get the biggest possible picture with correct aspect-ratio. |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
51 * Felix Buenemann <Atmosfear@users.sourceforge.net> - March 12, 2001 |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
52 * - Minor bugfix to aspect-ratio vor non-4:3-resolutions (like 1280x1024) |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
53 * - Bugfix to check_events() to reveal mouse cursor after 'q'-quit in |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
54 * fullscreen-mode |
351 | 55 * Felix Buenemann <Atmosfear@users.sourceforge.net> - April 10, 2001 |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
56 * - Changed keypress-detection from keydown to keyup, seems to fix keyrepeat |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
57 * bug (key had to be pressed twice to be detected) |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
58 * - Changed key-handling: 'f' cycles fullscreen/windowed, ESC/RETURN/'q' quits |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
59 * - Bugfix which avoids exit, because return is passed to sdl-output on startup, |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
60 * which caused the player to exit (keyboard-buffer problem? better solution |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
61 * recommed) |
351 | 62 * Felix Buenemann <Atmosfear@users.sourceforge.net> - April 11, 2001 |
63 * - OSD and subtitle support added | |
64 * - some minor code-changes | |
355
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
65 * - added code to comply with new fullscreen meaning |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
66 * - changed fullscreen-mode-cycling from '+' to 'c' (interferred with audiosync |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
67 * adjustment) |
1 | 68 */ |
69 | |
70 #include <stdio.h> | |
71 #include <stdlib.h> | |
72 #include <string.h> | |
73 #include <inttypes.h> | |
74 | |
75 #include "config.h" | |
76 #include "video_out.h" | |
77 #include "video_out_internal.h" | |
78 | |
354 | 79 #include "fastmemcpy.h" |
350 | 80 |
1 | 81 LIBVO_EXTERN(sdl) |
82 | |
83 //#include "log.h" | |
84 //#define LOG if(0)printf | |
85 | |
351 | 86 /* Uncomment if you want to force Xv SDL output? */ |
87 /* #define SDL_FORCEXV */ | |
88 | |
1 | 89 static vo_info_t vo_info = |
90 { | |
84 | 91 "SDL YUV overlay (SDL v1.1.7+ only!)", |
1 | 92 "sdl", |
93 "Ryan C. Gordon <icculus@lokigames.com>", | |
94 "" | |
95 }; | |
96 | |
97 #include <SDL/SDL.h> | |
98 | |
99 /** Private SDL Data structure **/ | |
100 | |
101 static struct sdl_priv_s { | |
102 | |
103 /* SDL YUV surface & overlay */ | |
104 SDL_Surface *surface; | |
105 SDL_Overlay *overlay; | |
106 // SDL_Overlay *current_frame; | |
107 | |
108 /* available fullscreen modes */ | |
109 SDL_Rect **fullmodes; | |
110 | |
111 /* surface attributes for fullscreen and windowed mode */ | |
112 Uint32 sdlflags, sdlfullflags; | |
113 | |
114 /* save the windowed output extents */ | |
115 SDL_Rect windowsize; | |
116 | |
117 /* Bits per Pixel */ | |
118 Uint8 bpp; | |
119 | |
120 /* current fullscreen mode, 0 = highest available fullscreen mode */ | |
121 int fullmode; | |
122 | |
123 /* YUV ints */ | |
124 int framePlaneY, framePlaneUV; | |
125 int stridePlaneY, stridePlaneUV; | |
126 int width,height; | |
127 int format; | |
128 } sdl_priv; | |
129 | |
130 | |
351 | 131 /** libvo Plugin functions **/ |
132 | |
133 /** | |
134 * draw_alpha is used for osd and subtitle display. | |
135 * | |
136 **/ | |
137 | |
138 //void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride); | |
139 //void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride); | |
140 | |
141 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ | |
142 struct sdl_priv_s *priv = &sdl_priv; | |
143 int x,y; | |
144 | |
145 if (priv->format==IMGFMT_YV12) | |
146 vo_draw_alpha_yv12(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+priv->width*y0+x0,priv->width); | |
147 else | |
148 vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0),2*priv->width); | |
149 | |
150 } | |
1 | 151 |
152 | |
153 /** | |
154 * Take a null-terminated array of pointers, and find the last element. | |
155 * | |
156 * params : array == array of which we want to find the last element. | |
157 * returns : index of last NON-NULL element. | |
158 **/ | |
159 | |
160 static inline int findArrayEnd (SDL_Rect **array) | |
161 { | |
162 int i = 0; | |
163 while ( array[i++] ); /* keep loopin' ... */ | |
164 | |
165 /* return the index of the last array element */ | |
166 return i - 1; | |
167 } | |
168 | |
169 | |
170 /** | |
171 * Open and prepare SDL output. | |
172 * | |
173 * params : *plugin == | |
174 * *name == | |
175 * returns : 0 on success, -1 on failure | |
176 **/ | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
177 |
1 | 178 static int sdl_open (void *plugin, void *name) |
179 { | |
180 struct sdl_priv_s *priv = &sdl_priv; | |
181 const SDL_VideoInfo *vidInfo = NULL; | |
182 static int opened = 0; | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
183 |
1 | 184 if (opened) |
185 return 0; | |
186 opened = 1; | |
187 | |
188 // LOG (LOG_DEBUG, "SDL video out: Opened Plugin"); | |
351 | 189 |
190 /* does the user want SDL to try and force Xv */ | |
191 #ifdef SDL_FORCEXV | |
192 setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1); | |
193 #endif | |
1 | 194 |
84 | 195 /* default to no fullscreen mode, we'll set this as soon we have the avail. modes */ |
1 | 196 priv->fullmode = -2; |
197 /* other default values */ | |
198 priv->sdlflags = SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT; | |
199 priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT; | |
200 priv->surface = NULL; | |
201 priv->overlay = NULL; | |
202 priv->fullmodes = NULL; | |
351 | 203 priv->bpp = 0; //added atmos |
1 | 204 |
205 /* initialize the SDL Video system */ | |
206 if (SDL_Init (SDL_INIT_VIDEO)) { | |
207 // LOG (LOG_ERROR, "SDL video out: Initializing of SDL failed (SDL_Init). Please use the latest version of SDL."); | |
208 return -1; | |
209 } | |
210 | |
211 /* No Keyrepeats! */ | |
212 SDL_EnableKeyRepeat(0,0); | |
213 | |
214 /* get information about the graphics adapter */ | |
215 vidInfo = SDL_GetVideoInfo (); | |
216 | |
217 /* collect all fullscreen & hardware modes available */ | |
218 if (!(priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags))) { | |
219 | |
220 /* non hardware accelerated fullscreen modes */ | |
221 priv->sdlfullflags &= ~SDL_HWSURFACE; | |
222 priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags); | |
223 } | |
224 | |
225 /* test for normal resizeable & windowed hardware accellerated surfaces */ | |
226 if (!SDL_ListModes (vidInfo->vfmt, priv->sdlflags)) { | |
227 | |
228 /* test for NON hardware accelerated resizeable surfaces - poor you. | |
229 * That's all we have. If this fails there's nothing left. | |
230 * Theoretically there could be Fullscreenmodes left - we ignore this for now. | |
231 */ | |
232 priv->sdlflags &= ~SDL_HWSURFACE; | |
233 if ((!SDL_ListModes (vidInfo->vfmt, priv->sdlflags)) && (!priv->fullmodes)) { | |
234 // LOG (LOG_ERROR, "SDL video out: Couldn't get any acceptable SDL Mode for output. (SDL_ListModes failed)"); | |
235 return -1; | |
236 } | |
237 } | |
238 | |
239 | |
240 /* YUV overlays need at least 16-bit color depth, but the | |
241 * display might less. The SDL AAlib target says it can only do | |
242 * 8-bits, for example. So, if the display is less than 16-bits, | |
243 * we'll force the BPP to 16, and pray that SDL can emulate for us. | |
244 */ | |
245 priv->bpp = vidInfo->vfmt->BitsPerPixel; | |
246 if (priv->bpp < 16) { | |
247 /* | |
248 LOG (LOG_WARNING, "SDL video out: Your SDL display target wants to be at a color depth of (%d), but we need it to be at\ | |
249 least 16 bits, so we need to emulate 16-bit color. This is going to slow things down; you might want to\ | |
250 increase your display's color depth, if possible", priv->bpp); | |
251 */ | |
252 priv->bpp = 16; | |
253 } | |
254 | |
255 /* We dont want those in out event queue */ | |
256 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
257 SDL_EventState(SDL_KEYDOWN, SDL_IGNORE); |
1 | 258 SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE); |
259 SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE); | |
260 SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE); | |
261 SDL_EventState(SDL_QUIT, SDL_IGNORE); | |
262 SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); | |
263 SDL_EventState(SDL_USEREVENT, SDL_IGNORE); | |
264 | |
265 /* Success! */ | |
266 return 0; | |
267 } | |
268 | |
269 | |
270 /** | |
271 * Close SDL, Cleanups, Free Memory | |
272 * | |
273 * params : *plugin | |
274 * returns : non-zero on success, zero on error. | |
275 **/ | |
276 | |
277 static int sdl_close (void) | |
278 { | |
279 struct sdl_priv_s *priv = &sdl_priv; | |
280 | |
281 /* Cleanup YUV Overlay structure */ | |
282 if (priv->overlay) | |
283 SDL_FreeYUVOverlay(priv->overlay); | |
284 | |
285 /* Free our blitting surface */ | |
286 if (priv->surface) | |
287 SDL_FreeSurface(priv->surface); | |
288 | |
351 | 289 /* DONT attempt to free the fullscreen modes array. SDL_Quit* does this for us */ |
1 | 290 |
291 /* Cleanup SDL */ | |
351 | 292 SDL_Quit(); /* might have to be changed to quitsubsystem only, if plugins become |
293 changeable on the fly */ | |
294 | |
295 // LOG (LOG_DEBUG, "SDL video out: Closed Plugin"); | |
1 | 296 |
297 return 0; | |
298 } | |
299 | |
300 | |
301 /** | |
302 * Sets the specified fullscreen mode. | |
303 * | |
304 * params : mode == index of the desired fullscreen mode | |
305 * returns : doesn't return | |
306 **/ | |
307 | |
308 static void set_fullmode (int mode) | |
309 { | |
310 struct sdl_priv_s *priv = &sdl_priv; | |
311 SDL_Surface *newsurface = NULL; | |
97
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
312 int haspect, waspect = 0; |
1 | 313 |
314 /* if we haven't set a fullmode yet, default to the lowest res fullmode first */ | |
315 if (mode < 0) | |
316 mode = priv->fullmode = findArrayEnd(priv->fullmodes) - 1; | |
317 | |
97
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
318 /* Calculate proper aspect ratio for fullscreen |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
319 * Height smaller than expected: add horizontal black bars (haspect)*/ |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
320 haspect = (priv->width * (float) ((float) priv->fullmodes[mode]->h / (float) priv->fullmodes[mode]->w) - priv->height) * (float) ((float) priv->fullmodes[mode]->w / (float) priv->width); |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
321 /* Height bigger than expected: add vertical black bars (waspect)*/ |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
322 if (haspect < 0) { |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
323 haspect = 0; /* set haspect to zero because image will be scaled horizontal instead of vertical */ |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
324 waspect = priv->fullmodes[mode]->w - ((float) ((float) priv->fullmodes[mode]->h / (float) priv->height) * (float) priv->width); |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
325 } |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
326 // printf ("W-Aspect: %i H-Aspect: %i\n", waspect, haspect); |
84 | 327 |
97
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
328 /* change to given fullscreen mode and hide the mouse cursor */ |
cab74dfde6dd
Felix B¸«änemann added support for horizontal scaling for aspect-ratio in
atmosfear
parents:
84
diff
changeset
|
329 newsurface = SDL_SetVideoMode(priv->fullmodes[mode]->w - waspect, priv->fullmodes[mode]->h - haspect, priv->bpp, priv->sdlfullflags); |
1 | 330 |
331 /* if we were successfull hide the mouse cursor and save the mode */ | |
332 if (newsurface) { | |
333 priv->surface = newsurface; | |
334 SDL_ShowCursor(0); | |
335 } | |
336 } | |
337 | |
338 | |
339 /** | |
340 * Initialize an SDL surface and an SDL YUV overlay. | |
341 * | |
342 * params : width == width of video we'll be displaying. | |
343 * height == height of video we'll be displaying. | |
344 * fullscreen == want to be fullscreen? | |
345 * title == Title for window titlebar. | |
346 * returns : non-zero on success, zero on error. | |
347 **/ | |
348 | |
349 static uint32_t | |
350 init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) | |
351 //static int sdl_setup (int width, int height) | |
352 { | |
353 struct sdl_priv_s *priv = &sdl_priv; | |
357 | 354 unsigned int sdl_format; |
351 | 355 |
1 | 356 |
357 switch(format){ | |
351 | 358 case IMGFMT_YV12: |
359 sdl_format=SDL_YV12_OVERLAY; | |
360 printf("SDL: Using YV12 image format\n"); | |
361 break; | |
362 case IMGFMT_YUY2: | |
363 sdl_format=SDL_YUY2_OVERLAY; | |
364 printf("SDL: Using YUY2 image format\n"); | |
365 break; | |
1 | 366 default: |
367 printf("SDL: Unsupported image format (0x%X)\n",format); | |
368 return -1; | |
369 } | |
370 | |
371 sdl_open (NULL, NULL); | |
372 | |
351 | 373 /* Set output window title */ |
355
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
374 SDL_WM_SetCaption (".: MPlayer : F = Fullscreen/Windowed : C = Cycle Fullscreen Resolutions :.", "SDL Video Out"); |
351 | 375 |
1 | 376 /* Save the original Image size */ |
84 | 377 |
1 | 378 priv->width = width; |
379 priv->height = height; | |
380 priv->format = format; | |
381 | |
355
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
382 /* bit 0 (0x01) means fullscreen (-fs) |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
383 * bit 1 (0x02) means mode switching (-vm) |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
384 * bit 2 (0x04) enables software scaling (-zoom) |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
385 */ |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
386 // printf("SDL: fullscreenflag is set to: %i\n", fullscreen); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
387 // printf("SDL: Width: %i Height: %i D_Width %i D_Height: %i\n", width, height, d_width, d_height); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
388 switch(fullscreen){ |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
389 case 0x01: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
390 case 0x05: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
391 printf("SDL: setting zoomed fullscreen without modeswitching\n"); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
392 priv->windowsize.w = d_width; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
393 priv->windowsize.h = d_height; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
394 if(priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)) |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
395 SDL_ShowCursor(0); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
396 break; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
397 case 0x02: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
398 case 0x03: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
399 printf("SDL: setting nonzoomed fullscreen with modeswitching\n"); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
400 priv->windowsize.w = width; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
401 priv->windowsize.h = height; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
402 if(priv->surface = SDL_SetVideoMode (width, height, priv->bpp, priv->sdlfullflags)) |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
403 SDL_ShowCursor(0); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
404 break; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
405 case 0x06: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
406 case 0x07: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
407 printf("SDL: setting zoomed fullscreen with modeswitching\n"); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
408 priv->windowsize.w = width; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
409 priv->windowsize.h = height; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
410 priv->surface=NULL; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
411 set_fullmode(priv->fullmode); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
412 break; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
413 default: |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
414 printf("SDL: setting windowed mode\n"); |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
415 priv->windowsize.w = d_width; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
416 priv->windowsize.h = d_height; |
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
417 priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlflags); |
1 | 418 } |
419 if(!priv->surface) return -1; // cannot SetVideoMode | |
420 | |
421 /* Initialize and create the YUV Overlay used for video out */ | |
422 if (!(priv->overlay = SDL_CreateYUVOverlay (width, height, sdl_format, priv->surface))) { | |
423 printf ("SDL video out: Couldn't create an SDL-based YUV overlay\n"); | |
424 return -1; | |
425 } | |
426 priv->framePlaneY = width * height; | |
427 priv->framePlaneUV = (width * height) >> 2; | |
428 priv->stridePlaneY = width; | |
429 priv->stridePlaneUV = width/2; | |
430 | |
431 return 0; | |
432 } | |
433 | |
434 | |
435 /** | |
436 * Draw a frame to the SDL YUV overlay. | |
437 * | |
438 * params : *src[] == the Y, U, and V planes that make up the frame. | |
439 * returns : non-zero on success, zero on error. | |
440 **/ | |
441 | |
442 //static int sdl_draw_frame (frame_t *frame) | |
443 static uint32_t draw_frame(uint8_t *src[]) | |
444 { | |
445 struct sdl_priv_s *priv = &sdl_priv; | |
446 uint8_t *dst; | |
447 | |
448 // priv->current_frame = (SDL_Overlay*) frame->private; | |
449 // SDL_UnlockYUVOverlay (priv->current_frame); | |
450 | |
451 if (SDL_LockYUVOverlay (priv->overlay)) { | |
452 // LOG (LOG_ERROR, "SDL video out: Couldn't lock SDL-based YUV overlay"); | |
453 return -1; | |
454 } | |
455 | |
456 switch(priv->format){ | |
457 case IMGFMT_YV12: | |
458 dst = (uint8_t *) *(priv->overlay->pixels); | |
459 memcpy (dst, src[0], priv->framePlaneY); | |
460 dst += priv->framePlaneY; | |
461 memcpy (dst, src[2], priv->framePlaneUV); | |
462 dst += priv->framePlaneUV; | |
463 memcpy (dst, src[1], priv->framePlaneUV); | |
464 break; | |
465 case IMGFMT_YUY2: | |
466 dst = (uint8_t *) *(priv->overlay->pixels); | |
467 memcpy (dst, src[0], priv->width*priv->height*2); | |
468 break; | |
469 } | |
470 | |
471 SDL_UnlockYUVOverlay (priv->overlay); | |
472 | |
473 return 0; | |
474 } | |
475 | |
476 | |
477 /** | |
478 * Draw a slice (16 rows of image) to the SDL YUV overlay. | |
479 * | |
480 * params : *src[] == the Y, U, and V planes that make up the slice. | |
481 * returns : non-zero on error, zero on success. | |
482 **/ | |
483 | |
484 //static uint32_t draw_slice(uint8_t *src[], uint32_t slice_num) | |
485 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) | |
486 { | |
487 struct sdl_priv_s *priv = &sdl_priv; | |
488 uint8_t *dst; | |
489 uint8_t *src; | |
490 int i; | |
491 | |
492 //priv->current_frame = priv->overlay; | |
493 | |
494 if (SDL_LockYUVOverlay (priv->overlay)) { | |
495 // LOG (LOG_ERROR, "SDL video out: Couldn't lock SDL-based YUV overlay"); | |
496 return -1; | |
497 } | |
498 | |
499 dst = (uint8_t *) *(priv->overlay->pixels) | |
500 + (priv->stridePlaneY * y + x); | |
501 src = image[0]; | |
502 for(i=0;i<h;i++){ | |
503 memcpy(dst,src,w); | |
504 src+=stride[0]; | |
505 dst+=priv->stridePlaneY; | |
506 } | |
507 | |
508 x/=2;y/=2;w/=2;h/=2; | |
509 | |
510 dst = (uint8_t *) *(priv->overlay->pixels) + priv->framePlaneY | |
511 + (priv->stridePlaneUV * y + x); | |
512 src = image[2]; | |
513 for(i=0;i<h;i++){ | |
514 memcpy(dst,src,w); | |
515 src+=stride[2]; | |
516 dst+=priv->stridePlaneUV; | |
517 } | |
518 | |
519 dst = (uint8_t *) *(priv->overlay->pixels) + priv->framePlaneY | |
520 + priv->framePlaneUV + (priv->stridePlaneUV * y + x); | |
521 src = image[1]; | |
522 for(i=0;i<h;i++){ | |
523 memcpy(dst,src,w); | |
524 src+=stride[1]; | |
525 dst+=priv->stridePlaneUV; | |
526 } | |
527 | |
528 #if 0 | |
529 dst = (uint8_t *) *(priv->overlay->pixels) + (priv->slicePlaneY * slice_num); | |
530 memcpy (dst, src[0], priv->slicePlaneY); | |
531 dst = (uint8_t *) *(priv->overlay->pixels) + priv->framePlaneY + (priv->slicePlaneUV * slice_num); | |
532 memcpy (dst, src[2], priv->slicePlaneUV); | |
533 dst += priv->framePlaneUV; | |
534 memcpy (dst, src[1], priv->slicePlaneUV); | |
535 #endif | |
536 | |
537 SDL_UnlockYUVOverlay (priv->overlay); | |
538 | |
539 return 0; | |
540 } | |
541 | |
542 | |
543 | |
544 /** | |
545 * Checks for SDL keypress and window resize events | |
546 * | |
547 * params : none | |
548 * returns : doesn't return | |
549 **/ | |
550 | |
551 #include "../linux/keycodes.h" | |
552 extern void mplayer_put_key(int code); | |
553 | |
554 static void check_events (void) | |
555 { | |
556 struct sdl_priv_s *priv = &sdl_priv; | |
557 SDL_Event event; | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
558 SDLKey keypressed = 0; |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
559 static int firstcheck = 0; |
1 | 560 |
561 /* Poll the waiting SDL Events */ | |
562 while ( SDL_PollEvent(&event) ) { | |
563 switch (event.type) { | |
564 | |
565 /* capture window resize events */ | |
566 case SDL_VIDEORESIZE: | |
567 priv->surface = SDL_SetVideoMode(event.resize.w, event.resize.h, priv->bpp, priv->sdlflags); | |
568 | |
569 /* save video extents, to restore them after going fullscreen */ | |
570 //if(!(priv->surface->flags & SDL_FULLSCREEN)) { | |
571 priv->windowsize.w = priv->surface->w; | |
572 priv->windowsize.h = priv->surface->h; | |
573 //} | |
574 // LOG (LOG_DEBUG, "SDL video out: Window resize"); | |
575 break; | |
576 | |
577 | |
578 /* graphics mode selection shortcuts */ | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
579 case SDL_KEYUP: |
1 | 580 keypressed = event.key.keysym.sym; |
265
1d02e6f7c63a
Only small change to allow pausing of movie (p or SPACE).
atmosfear
parents:
97
diff
changeset
|
581 |
357 | 582 /* c key pressed. c cycles through available fullscreenmodes, if we have some */ |
355
70833462dee9
- added code to comply with new fullscreen meaning
atmosfear
parents:
354
diff
changeset
|
583 if ( ((keypressed == SDLK_c)) && (priv->fullmodes) ) { |
1 | 584 /* select next fullscreen mode */ |
585 priv->fullmode++; | |
586 if (priv->fullmode > (findArrayEnd(priv->fullmodes) - 1)) priv->fullmode = 0; | |
587 set_fullmode(priv->fullmode); | |
588 | |
589 // LOG (LOG_DEBUG, "SDL video out: Set next available fullscreen mode."); | |
590 } | |
591 | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
592 /* f key pressed toggles/exits fullscreenmode */ |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
593 else if ( keypressed == SDLK_f ) { |
265
1d02e6f7c63a
Only small change to allow pausing of movie (p or SPACE).
atmosfear
parents:
97
diff
changeset
|
594 if (priv->surface->flags & SDL_FULLSCREEN) { |
1 | 595 priv->surface = SDL_SetVideoMode(priv->windowsize.w, priv->windowsize.h, priv->bpp, priv->sdlflags); |
596 SDL_ShowCursor(1); | |
597 // LOG (LOG_DEBUG, "SDL video out: Windowed mode"); | |
598 } | |
599 else if (priv->fullmodes){ | |
600 set_fullmode(priv->fullmode); | |
601 | |
602 // LOG (LOG_DEBUG, "SDL video out: Set fullscreen mode."); | |
603 } | |
604 } | |
605 | |
606 else switch(keypressed){ | |
607 // case SDLK_q: if(!(priv->surface->flags & SDL_FULLSCREEN))mplayer_put_key('q');break; | |
331
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
608 case SDLK_RETURN: |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
609 if (!firstcheck) { firstcheck = 1; break; } |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
610 case SDLK_ESCAPE: |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
611 case SDLK_q: |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
612 SDL_ShowCursor(1); |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
613 mplayer_put_key('q'); |
0f1737e626fa
- Changed keypress-detection from keydown to keyup, seems to fix keyrepeat
atmosfear
parents:
265
diff
changeset
|
614 break; |
265
1d02e6f7c63a
Only small change to allow pausing of movie (p or SPACE).
atmosfear
parents:
97
diff
changeset
|
615 case SDLK_p: mplayer_put_key('p');break; |
1d02e6f7c63a
Only small change to allow pausing of movie (p or SPACE).
atmosfear
parents:
97
diff
changeset
|
616 case SDLK_SPACE: mplayer_put_key(' ');break; |
1 | 617 case SDLK_UP: mplayer_put_key(KEY_UP);break; |
618 case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break; | |
619 case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break; | |
620 case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT);break; | |
621 case SDLK_PLUS: | |
622 case SDLK_KP_PLUS: mplayer_put_key('+');break; | |
623 case SDLK_MINUS: | |
624 case SDLK_KP_MINUS: mplayer_put_key('-');break; | |
625 } | |
626 | |
627 break; | |
628 } | |
629 } | |
630 } | |
631 | |
632 | |
633 /** | |
634 * Display the surface we have written our data to and check for events. | |
635 * | |
636 * params : mode == index of the desired fullscreen mode | |
637 * returns : doesn't return | |
638 **/ | |
639 | |
640 static void flip_page (void) | |
641 { | |
642 struct sdl_priv_s *priv = &sdl_priv; | |
643 | |
351 | 644 //vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride) |
645 vo_draw_text(priv->width,priv->height,draw_alpha); | |
646 | |
1 | 647 /* check and react on keypresses and window resizes */ |
648 check_events(); | |
649 | |
650 /* blit to the YUV overlay */ | |
651 SDL_DisplayYUVOverlay (priv->overlay, &priv->surface->clip_rect); | |
652 | |
653 /* check if we have a double buffered surface and flip() if we do. */ | |
654 if ( priv->surface->flags & SDL_DOUBLEBUF ) | |
655 SDL_Flip(priv->surface); | |
656 | |
657 SDL_LockYUVOverlay (priv->overlay); | |
658 } | |
659 | |
660 #if 0 | |
661 static frame_t* sdl_allocate_image_buffer(int width, int height) | |
662 { | |
663 struct sdl_priv_s *priv = &sdl_priv; | |
664 frame_t *frame; | |
665 | |
666 if (!(frame = malloc (sizeof (frame_t)))) | |
667 return NULL; | |
668 | |
669 if (!(frame->private = (void*) SDL_CreateYUVOverlay (width, height, | |
670 SDL_IYUV_OVERLAY, priv->surface))) | |
671 { | |
672 // LOG (LOG_ERROR, "SDL video out: Couldn't create an SDL-based YUV overlay"); | |
673 return NULL; | |
674 } | |
675 | |
676 frame->base[0] = (uint8_t*) ((SDL_Overlay*) (frame->private))->pixels[0]; | |
677 frame->base[1] = (uint8_t*) ((SDL_Overlay*) (frame->private))->pixels[1]; | |
678 frame->base[2] = (uint8_t*) ((SDL_Overlay*) (frame->private))->pixels[2]; | |
679 | |
680 SDL_LockYUVOverlay ((SDL_Overlay*) frame->private); | |
681 return frame; | |
682 } | |
683 | |
684 static void sdl_free_image_buffer(frame_t* frame) | |
685 { | |
686 SDL_FreeYUVOverlay((SDL_Overlay*) frame->private); | |
687 free(frame); | |
688 } | |
689 #endif | |
690 | |
691 static uint32_t | |
692 query_format(uint32_t format) | |
693 { | |
694 switch(format){ | |
695 case IMGFMT_YV12: | |
696 case IMGFMT_YUY2: | |
697 // case IMGFMT_RGB|24: | |
698 // case IMGFMT_BGR|24: | |
699 return 1; | |
700 } | |
701 return 0; | |
702 } | |
703 | |
704 static const vo_info_t* | |
705 get_info(void) | |
706 { | |
707 return &vo_info; | |
708 } | |
709 | |
710 | |
711 static void | |
712 uninit(void) | |
713 { | |
714 sdl_close(); | |
715 } | |
716 |