annotate libvo/vo_sdl.c @ 357:681979d4031a

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