Mercurial > mplayer.hg
annotate libmenu/vf_menu.c @ 24305:414b72437fe3
Increase number of skipped buffers to 5 to avoid mixing teletext pages from
different channels during channel switch.
author | voroshil |
---|---|
date | Sun, 02 Sep 2007 06:12:32 +0000 |
parents | 8572d2ef5263 |
children | ea73d155ef00 |
rev | line source |
---|---|
8197 | 1 |
16862 | 2 #include "config.h" |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
3 #include "mp_msg.h" |
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
4 #include "help_mp.h" |
8197 | 5 |
6 #include <stdio.h> | |
7 #include <stdlib.h> | |
8 #include <string.h> | |
9 | |
8623
440301fef3fe
Added/reordered #includes to silence warnings about "implicit declaration".
rathann
parents:
8251
diff
changeset
|
10 #ifdef HAVE_MALLOC_H |
440301fef3fe
Added/reordered #includes to silence warnings about "implicit declaration".
rathann
parents:
8251
diff
changeset
|
11 #include <malloc.h> |
440301fef3fe
Added/reordered #includes to silence warnings about "implicit declaration".
rathann
parents:
8251
diff
changeset
|
12 #endif |
8197 | 13 |
23338
2a66d95355f0
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents:
22284
diff
changeset
|
14 #include "mplayer.h" |
16862 | 15 #include "mp_msg.h" |
8197 | 16 |
16862 | 17 #include "libmpcodecs/img_format.h" |
18 #include "libmpcodecs/mp_image.h" | |
19 #include "libmpcodecs/vf.h" | |
8197 | 20 |
16862 | 21 #include "libvo/fastmemcpy.h" |
22 #include "libvo/video_out.h" | |
23 #include "libvo/font_load.h" | |
24 #include "input/input.h" | |
25 #include "m_struct.h" | |
8197 | 26 #include "menu.h" |
22284 | 27 #include "access_mpcontext.h" |
8197 | 28 |
29 | |
30 static struct vf_priv_s* st_priv = NULL; | |
31 | |
32 static mp_image_t* pause_mpi = NULL; | |
33 static int go2pause = 0; | |
13344
0d96af97ec00
option to display menu at startup, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
10397
diff
changeset
|
34 /// if nonzero display menu at startup |
13528 | 35 int attribute_used menu_startup = 0; |
8197 | 36 |
37 struct vf_priv_s { | |
38 menu_t* root; | |
39 menu_t* current; | |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
40 int passthrough; |
8197 | 41 }; |
42 | |
17908 | 43 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts); |
8197 | 44 |
45 void vf_menu_pause_update(struct vf_instance_s* vf) { | |
22284 | 46 vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx); |
8197 | 47 if(pause_mpi) { |
17908 | 48 put_image(vf,pause_mpi, MP_NOPTS_VALUE); |
8197 | 49 // Don't draw the osd atm |
50 //vf->control(vf,VFCTRL_DRAW_OSD,NULL); | |
51 video_out->flip_page(); | |
52 } | |
53 } | |
54 | |
55 static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) { | |
56 | |
57 switch(cmd->id) { | |
58 case MP_CMD_PAUSE : | |
21818 | 59 #if 0 // http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2003-March/017286.html |
8197 | 60 if(!paused && !go2pause) { // Initial pause cmd -> wait the next put_image |
61 go2pause = 1; | |
62 return 1; | |
63 } | |
9903
7d70e56f317a
10l fix by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents:
9755
diff
changeset
|
64 #endif |
8197 | 65 if(go2pause == 2) // Msg resent by put_image after saving the image |
66 go2pause = 0; | |
67 break; | |
68 case MP_CMD_MENU : { // Convert txt cmd from the users into libmenu stuff | |
69 char* arg = cmd->args[0].v.s; | |
70 | |
19489 | 71 if(!priv->current->show && !(strcmp(arg,"hide") == 0) ) |
8197 | 72 priv->current->show = 1; |
73 else if(strcmp(arg,"up") == 0) | |
74 menu_read_cmd(priv->current,MENU_CMD_UP); | |
75 else if(strcmp(arg,"down") == 0) | |
76 menu_read_cmd(priv->current,MENU_CMD_DOWN); | |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
77 else if(strcmp(arg,"left") == 0) |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
78 menu_read_cmd(priv->current,MENU_CMD_LEFT); |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
79 else if(strcmp(arg,"right") == 0) |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
80 menu_read_cmd(priv->current,MENU_CMD_RIGHT); |
8197 | 81 else if(strcmp(arg,"ok") == 0) |
82 menu_read_cmd(priv->current,MENU_CMD_OK); | |
83 else if(strcmp(arg,"cancel") == 0) | |
84 menu_read_cmd(priv->current,MENU_CMD_CANCEL); | |
19489 | 85 else if(strcmp(arg,"hide") == 0 || strcmp(arg,"toggle") == 0) |
8197 | 86 priv->current->show = 0; |
87 else | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
88 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_UnknownMenuCommand,arg); |
8197 | 89 return 1; |
90 } | |
91 case MP_CMD_SET_MENU : { | |
92 char* menu = cmd->args[0].v.s; | |
93 menu_t* l = priv->current; | |
94 priv->current = menu_open(menu); | |
95 if(!priv->current) { | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
96 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_FailedToOpenMenu,menu); |
8197 | 97 priv->current = l; |
98 priv->current->show = 0; | |
99 } else { | |
100 priv->current->show = 1; | |
101 priv->current->parent = l; | |
102 } | |
103 return 1; | |
104 } | |
105 } | |
106 return 0; | |
107 } | |
108 | |
109 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ | |
110 mp_image_t *dmpi; | |
111 | |
112 if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) { | |
113 dmpi = vf_get_image(vf->next,mpi->imgfmt,mpi->type, mpi->flags, mpi->w, mpi->h); | |
23458
973e53dc7df5
Do not use fast_memcpy for small size copy, esp. when the size is constant
reimar
parents:
23457
diff
changeset
|
114 memcpy(mpi->planes,dmpi->planes,MP_MAX_PLANES*sizeof(unsigned char*)); |
973e53dc7df5
Do not use fast_memcpy for small size copy, esp. when the size is constant
reimar
parents:
23457
diff
changeset
|
115 memcpy(mpi->stride,dmpi->stride,MP_MAX_PLANES*sizeof(unsigned int)); |
8197 | 116 mpi->flags|=MP_IMGFLAG_DIRECT; |
117 mpi->priv=(void*)dmpi; | |
118 return; | |
119 } | |
120 } | |
121 | |
122 static void key_cb(int code) { | |
123 menu_read_key(st_priv->current,code); | |
124 } | |
125 | |
17908 | 126 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ |
8197 | 127 mp_image_t *dmpi = NULL; |
128 | |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
129 if (vf->priv->passthrough) { |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
130 dmpi=vf_get_image(vf->next, IMGFMT_MPEGPES, MP_IMGTYPE_EXPORT, |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
131 0, mpi->w, mpi->h); |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
132 dmpi->planes[0]=mpi->planes[0]; |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
133 return vf_next_put_image(vf,dmpi, pts); |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
134 } |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
135 |
8251 | 136 if(vf->priv->current->show |
137 || (vf->priv->current->parent && vf->priv->current->parent->show)) { | |
8197 | 138 // Close all menu who requested it |
139 while(vf->priv->current->cl && vf->priv->current != vf->priv->root) { | |
140 menu_t* m = vf->priv->current; | |
141 vf->priv->current = m->parent ? m->parent : vf->priv->root; | |
142 menu_close(m); | |
143 } | |
144 | |
145 // Step 1 : save the picture | |
146 while(go2pause == 1) { | |
147 static char delay = 0; // Hack : wait the 2 frame to be sure to show the right picture | |
148 delay ^= 1; // after a seek | |
149 if(!delay) break; | |
150 | |
151 if(pause_mpi && (mpi->w != pause_mpi->w || mpi->h != pause_mpi->h || | |
152 mpi->imgfmt != pause_mpi->imgfmt)) { | |
153 free_mp_image(pause_mpi); | |
154 pause_mpi = NULL; | |
155 } | |
156 if(!pause_mpi) | |
157 pause_mpi = alloc_mpi(mpi->w,mpi->h,mpi->imgfmt); | |
158 copy_mpi(pause_mpi,mpi); | |
159 mp_input_queue_cmd(mp_input_parse_cmd("pause")); | |
160 go2pause = 2; | |
161 break; | |
162 } | |
163 | |
164 // Grab // Ungrab the keys | |
165 if(!mp_input_key_cb && vf->priv->current->show) | |
166 mp_input_key_cb = key_cb; | |
167 if(mp_input_key_cb && !vf->priv->current->show) | |
168 mp_input_key_cb = NULL; | |
169 | |
170 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
171 dmpi = mpi->priv; | |
172 else { | |
173 dmpi = vf_get_image(vf->next,mpi->imgfmt, | |
174 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, | |
175 mpi->w,mpi->h); | |
176 copy_mpi(dmpi,mpi); | |
177 } | |
178 menu_draw(vf->priv->current,dmpi); | |
179 | |
8244
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
180 } else { |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
181 if(mp_input_key_cb) |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
182 mp_input_key_cb = NULL; |
21924
422eef67d14a
speeds up mplayer execution by over FIVE times when all of the of the following apply:
gpoirier
parents:
21818
diff
changeset
|
183 |
422eef67d14a
speeds up mplayer execution by over FIVE times when all of the of the following apply:
gpoirier
parents:
21818
diff
changeset
|
184 if(mpi->flags&MP_IMGFLAG_DIRECT) |
422eef67d14a
speeds up mplayer execution by over FIVE times when all of the of the following apply:
gpoirier
parents:
21818
diff
changeset
|
185 dmpi = mpi->priv; |
422eef67d14a
speeds up mplayer execution by over FIVE times when all of the of the following apply:
gpoirier
parents:
21818
diff
changeset
|
186 else { |
21925 | 187 dmpi = vf_get_image(vf->next,mpi->imgfmt, |
188 MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, | |
189 mpi->w,mpi->h); | |
8244
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
190 |
21925 | 191 dmpi->stride[0] = mpi->stride[0]; |
192 dmpi->stride[1] = mpi->stride[1]; | |
193 dmpi->stride[2] = mpi->stride[2]; | |
194 dmpi->planes[0] = mpi->planes[0]; | |
195 dmpi->planes[1] = mpi->planes[1]; | |
196 dmpi->planes[2] = mpi->planes[2]; | |
197 dmpi->priv = mpi->priv; | |
198 } | |
21924
422eef67d14a
speeds up mplayer execution by over FIVE times when all of the of the following apply:
gpoirier
parents:
21818
diff
changeset
|
199 } |
17908 | 200 return vf_next_put_image(vf,dmpi, pts); |
8197 | 201 } |
202 | |
203 static void uninit(vf_instance_t *vf) { | |
204 vf->priv=NULL; | |
205 if(pause_mpi) { | |
206 free_mp_image(pause_mpi); | |
207 pause_mpi = NULL; | |
208 } | |
209 } | |
210 | |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
211 static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
212 unsigned int flags, unsigned int outfmt) { |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
213 #ifdef HAVE_FREETYPE |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
214 // here is the right place to get screen dimensions |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
215 if (force_load_font) { |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
216 force_load_font = 0; |
23338
2a66d95355f0
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents:
22284
diff
changeset
|
217 load_font_ft(width,height,&vo_font,font_name); |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
218 } |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
219 #endif |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
220 if(outfmt == IMGFMT_MPEGPES) |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
221 vf->priv->passthrough = 1; |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
222 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
223 } |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
224 |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
225 static int query_format(struct vf_instance_s* vf, unsigned int fmt){ |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
226 return (vf_next_query_format(vf,fmt)); |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
227 } |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
228 |
23366
b344b6520518
rename some menu open functions, to avoid confusion with libc native open()
ben
parents:
23338
diff
changeset
|
229 static int open_vf(vf_instance_t *vf, char* args){ |
8197 | 230 if(!st_priv) { |
231 st_priv = calloc(1,sizeof(struct vf_priv_s)); | |
232 st_priv->root = st_priv->current = menu_open(args); | |
233 if(!st_priv->current) { | |
234 free(st_priv); | |
235 st_priv = NULL; | |
236 return 0; | |
237 } | |
13344
0d96af97ec00
option to display menu at startup, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
10397
diff
changeset
|
238 st_priv->root->show = menu_startup; |
8197 | 239 mp_input_add_cmd_filter((mp_input_cmd_filter)cmd_filter,st_priv); |
240 } | |
241 | |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
242 vf->config = config; |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
243 vf->query_format=query_format; |
8197 | 244 vf->put_image = put_image; |
245 vf->get_image = get_image; | |
246 vf->uninit=uninit; | |
247 vf->priv=st_priv; | |
248 go2pause=0; | |
249 | |
250 return 1; | |
251 } | |
252 | |
253 | |
254 vf_info_t vf_info_menu = { | |
255 "Internal filter for libmenu", | |
256 "menu", | |
257 "Albeu", | |
258 "", | |
23366
b344b6520518
rename some menu open functions, to avoid confusion with libc native open()
ben
parents:
23338
diff
changeset
|
259 open_vf, |
9755 | 260 NULL |
8197 | 261 }; |
262 | |
263 | |
264 |