# HG changeset patch # User gpoirier # Date 1168953843 0 # Node ID 422eef67d14ab5b4792649aeb5cfa483fff320a3 # Parent 1658f7d97b276203b86af9da2d2f4dc21622061d speeds up mplayer execution by over FIVE times when all of the of the following apply: * menus are enabled * menus are enabled but not displayed * direct rendering is in use Patch by Adam Sulmicki % adam A cfar P umd P edu % Original thread: date: Jan 7, 2007 11:07 PM subject: [MPlayer-dev-eng] [PATCH] slow menus : try two Other threads: date: Jan 7, 2007 12:39 PM subject: [MPlayer-advusers] [patch] slow menus Also: date: Jan 6, 2007 11:13 PM subject: [MPlayer-advusers] [patch] slow menus And: date: Jan 2, 2007 11:46 PM subject: [MPlayer-advusers] slow down with menu off Finaly: date: Dec 24, 2006 11:25 AM subject: [MPlayer-users] slow down with menu off diff -r 1658f7d97b27 -r 422eef67d14a AUTHORS --- a/AUTHORS Tue Jan 16 09:49:28 2007 +0000 +++ b/AUTHORS Tue Jan 16 13:24:03 2007 +0000 @@ -1039,6 +1039,9 @@ Sudrien * softgrip +Sulmicki, Adam + * profiling and menu fixes + Szumiela, Marcin * divxplayer diff -r 1658f7d97b27 -r 422eef67d14a libmenu/vf_menu.c --- a/libmenu/vf_menu.c Tue Jan 16 09:49:28 2007 +0000 +++ b/libmenu/vf_menu.c Tue Jan 16 13:24:03 2007 +0000 @@ -233,6 +233,10 @@ } else { if(mp_input_key_cb) mp_input_key_cb = NULL; + + if(mpi->flags&MP_IMGFLAG_DIRECT) + dmpi = mpi->priv; + else { dmpi = vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w,mpi->h); @@ -245,6 +249,7 @@ dmpi->planes[2] = mpi->planes[2]; dmpi->priv = mpi->priv; } + } return vf_next_put_image(vf,dmpi, pts); }