Mercurial > mplayer.hg
annotate libmenu/vf_menu.c @ 21875:d81cf0be50f0
Frametime was being read from the wrong offset, compare
http://www.onicos.com/staff/iz/formats/gif.html#gceb
patch by John Koleszar, jkoleszar on2 com
author | diego |
---|---|
date | Sat, 13 Jan 2007 06:00:34 +0000 |
parents | 7bd48682de5f |
children | 422eef67d14a |
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 |
16862 | 14 #include "mp_msg.h" |
8197 | 15 |
16862 | 16 #include "libmpcodecs/img_format.h" |
17 #include "libmpcodecs/mp_image.h" | |
18 #include "libmpcodecs/vf.h" | |
8197 | 19 |
16862 | 20 #include "libvo/fastmemcpy.h" |
21 #include "libvo/video_out.h" | |
22 #include "libvo/font_load.h" | |
23 #include "input/input.h" | |
24 #include "m_struct.h" | |
8197 | 25 #include "menu.h" |
26 | |
27 extern vo_functions_t* video_out; | |
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 static mp_image_t* alloc_mpi(int w, int h, uint32_t fmt) { | |
46 mp_image_t* mpi = new_mp_image(w,h); | |
47 | |
48 mp_image_setfmt(mpi,fmt); | |
49 // IF09 - allocate space for 4. plane delta info - unused | |
50 if (mpi->imgfmt == IMGFMT_IF09) | |
51 { | |
52 mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+ | |
53 mpi->chroma_width*mpi->chroma_height); | |
54 /* delta table, just for fun ;) */ | |
55 mpi->planes[3]=mpi->planes[0]+2*(mpi->chroma_width*mpi->chroma_height); | |
56 } | |
57 else | |
58 mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8); | |
59 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
60 // YV12/I420/YVU9/IF09. feel free to add other planar formats here... | |
61 if(!mpi->stride[0]) mpi->stride[0]=mpi->width; | |
62 if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=mpi->chroma_width; | |
63 if(mpi->flags&MP_IMGFLAG_SWAPPED){ | |
64 // I420/IYUV (Y,U,V) | |
65 mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height; | |
66 mpi->planes[2]=mpi->planes[1]+mpi->chroma_width*mpi->chroma_height; | |
67 } else { | |
68 // YV12,YVU9,IF09 (Y,V,U) | |
69 mpi->planes[2]=mpi->planes[0]+mpi->width*mpi->height; | |
70 mpi->planes[1]=mpi->planes[2]+mpi->chroma_width*mpi->chroma_height; | |
71 } | |
72 } else { | |
73 if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8; | |
74 } | |
75 mpi->flags|=MP_IMGFLAG_ALLOCATED; | |
76 | |
77 return mpi; | |
78 } | |
79 | |
80 void vf_menu_pause_update(struct vf_instance_s* vf) { | |
81 if(pause_mpi) { | |
17908 | 82 put_image(vf,pause_mpi, MP_NOPTS_VALUE); |
8197 | 83 // Don't draw the osd atm |
84 //vf->control(vf,VFCTRL_DRAW_OSD,NULL); | |
85 video_out->flip_page(); | |
86 } | |
87 } | |
88 | |
89 static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) { | |
90 | |
91 switch(cmd->id) { | |
92 case MP_CMD_PAUSE : | |
21818 | 93 #if 0 // http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2003-March/017286.html |
8197 | 94 if(!paused && !go2pause) { // Initial pause cmd -> wait the next put_image |
95 go2pause = 1; | |
96 return 1; | |
97 } | |
9903
7d70e56f317a
10l fix by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents:
9755
diff
changeset
|
98 #endif |
8197 | 99 if(go2pause == 2) // Msg resent by put_image after saving the image |
100 go2pause = 0; | |
101 break; | |
102 case MP_CMD_MENU : { // Convert txt cmd from the users into libmenu stuff | |
103 char* arg = cmd->args[0].v.s; | |
104 | |
19489 | 105 if(!priv->current->show && !(strcmp(arg,"hide") == 0) ) |
8197 | 106 priv->current->show = 1; |
107 else if(strcmp(arg,"up") == 0) | |
108 menu_read_cmd(priv->current,MENU_CMD_UP); | |
109 else if(strcmp(arg,"down") == 0) | |
110 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
|
111 else if(strcmp(arg,"left") == 0) |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
112 menu_read_cmd(priv->current,MENU_CMD_LEFT); |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
113 else if(strcmp(arg,"right") == 0) |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
17908
diff
changeset
|
114 menu_read_cmd(priv->current,MENU_CMD_RIGHT); |
8197 | 115 else if(strcmp(arg,"ok") == 0) |
116 menu_read_cmd(priv->current,MENU_CMD_OK); | |
117 else if(strcmp(arg,"cancel") == 0) | |
118 menu_read_cmd(priv->current,MENU_CMD_CANCEL); | |
19489 | 119 else if(strcmp(arg,"hide") == 0 || strcmp(arg,"toggle") == 0) |
8197 | 120 priv->current->show = 0; |
121 else | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
122 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_UnknownMenuCommand,arg); |
8197 | 123 return 1; |
124 } | |
125 case MP_CMD_SET_MENU : { | |
126 char* menu = cmd->args[0].v.s; | |
127 menu_t* l = priv->current; | |
128 priv->current = menu_open(menu); | |
129 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
|
130 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_FailedToOpenMenu,menu); |
8197 | 131 priv->current = l; |
132 priv->current->show = 0; | |
133 } else { | |
134 priv->current->show = 1; | |
135 priv->current->parent = l; | |
136 } | |
137 return 1; | |
138 } | |
139 } | |
140 return 0; | |
141 } | |
142 | |
143 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ | |
144 mp_image_t *dmpi; | |
145 | |
146 if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) { | |
147 dmpi = vf_get_image(vf->next,mpi->imgfmt,mpi->type, mpi->flags, mpi->w, mpi->h); | |
148 memcpy(mpi->planes,dmpi->planes,MP_MAX_PLANES*sizeof(unsigned char*)); | |
149 memcpy(mpi->stride,dmpi->stride,MP_MAX_PLANES*sizeof(unsigned int)); | |
150 mpi->flags|=MP_IMGFLAG_DIRECT; | |
151 mpi->priv=(void*)dmpi; | |
152 return; | |
153 } | |
154 } | |
155 | |
156 static void key_cb(int code) { | |
157 menu_read_key(st_priv->current,code); | |
158 } | |
159 | |
160 | |
161 | |
162 inline static void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi) { | |
163 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
164 memcpy_pic(dmpi->planes[0],mpi->planes[0], mpi->w, mpi->h, | |
165 dmpi->stride[0],mpi->stride[0]); | |
166 memcpy_pic(dmpi->planes[1],mpi->planes[1], mpi->chroma_width, mpi->chroma_height, | |
167 dmpi->stride[1],mpi->stride[1]); | |
168 memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->chroma_width, mpi->chroma_height, | |
169 dmpi->stride[2],mpi->stride[2]); | |
170 } else { | |
171 memcpy_pic(dmpi->planes[0],mpi->planes[0], | |
172 mpi->w*(dmpi->bpp/8), mpi->h, | |
173 dmpi->stride[0],mpi->stride[0]); | |
174 } | |
175 } | |
176 | |
177 | |
178 | |
17908 | 179 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ |
8197 | 180 mp_image_t *dmpi = NULL; |
181 | |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
182 if (vf->priv->passthrough) { |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
183 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
|
184 0, mpi->w, mpi->h); |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
185 dmpi->planes[0]=mpi->planes[0]; |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
186 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
|
187 } |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
188 |
8251 | 189 if(vf->priv->current->show |
190 || (vf->priv->current->parent && vf->priv->current->parent->show)) { | |
8197 | 191 // Close all menu who requested it |
192 while(vf->priv->current->cl && vf->priv->current != vf->priv->root) { | |
193 menu_t* m = vf->priv->current; | |
194 vf->priv->current = m->parent ? m->parent : vf->priv->root; | |
195 menu_close(m); | |
196 } | |
197 | |
198 // Step 1 : save the picture | |
199 while(go2pause == 1) { | |
200 static char delay = 0; // Hack : wait the 2 frame to be sure to show the right picture | |
201 delay ^= 1; // after a seek | |
202 if(!delay) break; | |
203 | |
204 if(pause_mpi && (mpi->w != pause_mpi->w || mpi->h != pause_mpi->h || | |
205 mpi->imgfmt != pause_mpi->imgfmt)) { | |
206 free_mp_image(pause_mpi); | |
207 pause_mpi = NULL; | |
208 } | |
209 if(!pause_mpi) | |
210 pause_mpi = alloc_mpi(mpi->w,mpi->h,mpi->imgfmt); | |
211 copy_mpi(pause_mpi,mpi); | |
212 mp_input_queue_cmd(mp_input_parse_cmd("pause")); | |
213 go2pause = 2; | |
214 break; | |
215 } | |
216 | |
217 // Grab // Ungrab the keys | |
218 if(!mp_input_key_cb && vf->priv->current->show) | |
219 mp_input_key_cb = key_cb; | |
220 if(mp_input_key_cb && !vf->priv->current->show) | |
221 mp_input_key_cb = NULL; | |
222 | |
223 if(mpi->flags&MP_IMGFLAG_DIRECT) | |
224 dmpi = mpi->priv; | |
225 else { | |
226 dmpi = vf_get_image(vf->next,mpi->imgfmt, | |
227 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, | |
228 mpi->w,mpi->h); | |
229 copy_mpi(dmpi,mpi); | |
230 } | |
231 menu_draw(vf->priv->current,dmpi); | |
232 | |
8244
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
233 } else { |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
234 if(mp_input_key_cb) |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
235 mp_input_key_cb = NULL; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
236 dmpi = vf_get_image(vf->next,mpi->imgfmt, |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
237 MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
238 mpi->w,mpi->h); |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
239 |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
240 dmpi->stride[0] = mpi->stride[0]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
241 dmpi->stride[1] = mpi->stride[1]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
242 dmpi->stride[2] = mpi->stride[2]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
243 dmpi->planes[0] = mpi->planes[0]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
244 dmpi->planes[1] = mpi->planes[1]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
245 dmpi->planes[2] = mpi->planes[2]; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
246 dmpi->priv = mpi->priv; |
64352fb332b6
don't fully-copy the planes if the menu doesn't show (faster)
colin
parents:
8224
diff
changeset
|
247 } |
17908 | 248 return vf_next_put_image(vf,dmpi, pts); |
8197 | 249 } |
250 | |
251 static void uninit(vf_instance_t *vf) { | |
252 vf->priv=NULL; | |
253 if(pause_mpi) { | |
254 free_mp_image(pause_mpi); | |
255 pause_mpi = NULL; | |
256 } | |
257 } | |
258 | |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
259 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
|
260 unsigned int flags, unsigned int outfmt) { |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
261 #ifdef HAVE_FREETYPE |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
262 // 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
|
263 if (force_load_font) { |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
264 force_load_font = 0; |
8635
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
8623
diff
changeset
|
265 load_font_ft(width,height); |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
266 } |
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
267 #endif |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
268 if(outfmt == IMGFMT_MPEGPES) |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
269 vf->priv->passthrough = 1; |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
270 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
|
271 } |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
272 |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
273 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
|
274 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
|
275 } |
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
276 |
8197 | 277 static int open(vf_instance_t *vf, char* args){ |
278 if(!st_priv) { | |
279 st_priv = calloc(1,sizeof(struct vf_priv_s)); | |
280 st_priv->root = st_priv->current = menu_open(args); | |
281 if(!st_priv->current) { | |
282 free(st_priv); | |
283 st_priv = NULL; | |
284 return 0; | |
285 } | |
13344
0d96af97ec00
option to display menu at startup, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
10397
diff
changeset
|
286 st_priv->root->show = menu_startup; |
8197 | 287 mp_input_add_cmd_filter((mp_input_cmd_filter)cmd_filter,st_priv); |
288 } | |
289 | |
8224
fefc56153615
Fix freetype. Freetype is highly recommended for a nice output ;)
albeu
parents:
8197
diff
changeset
|
290 vf->config = config; |
21803
3acc4b00bcc6
allows OSD menu to be displayed when using MPEG PES video out
ben
parents:
19489
diff
changeset
|
291 vf->query_format=query_format; |
8197 | 292 vf->put_image = put_image; |
293 vf->get_image = get_image; | |
294 vf->uninit=uninit; | |
295 vf->priv=st_priv; | |
296 go2pause=0; | |
297 | |
298 return 1; | |
299 } | |
300 | |
301 | |
302 vf_info_t vf_info_menu = { | |
303 "Internal filter for libmenu", | |
304 "menu", | |
305 "Albeu", | |
306 "", | |
9755 | 307 open, |
308 NULL | |
8197 | 309 }; |
310 | |
311 | |
312 |