Mercurial > mplayer.hg
changeset 5224:f992a01ecc0d
using -dr instead -vaa_dr
| author | alex |
|---|---|
| date | Wed, 20 Mar 2002 15:39:08 +0000 |
| parents | 8c7b6ba2b5e9 |
| children | a4a39919022a |
| files | cfg-mplayer.h dec_video.c libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/video_out.c |
| diffstat | 5 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Wed Mar 20 15:38:13 2002 +0000 +++ b/cfg-mplayer.h Wed Mar 20 15:39:08 2002 +0000 @@ -35,7 +35,6 @@ extern char *lirc_configfile; #endif -#ifndef USE_LIBVO2 extern int vo_doublebuffering; extern int vo_vsync; extern int vo_fsmode; @@ -48,8 +47,7 @@ extern int vo_gamma_red_intensity; extern int vo_gamma_green_intensity; extern int vo_gamma_blue_intensity; -extern int vaa_use_dr; -#endif +extern int vo_directrendering; #ifdef USE_SUB extern int sub_unicode; @@ -253,7 +251,6 @@ {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, -#ifndef USE_LIBVO2 {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL}, {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL}, {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -267,9 +264,10 @@ {"red_intensity",&vo_gamma_red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, {"green_intensity",&vo_gamma_green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, {"blue_intensity",&vo_gamma_blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, - {"vaa_dr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"vaa_nodr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 1, 0, NULL}, -#endif + {"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nodr", &vo_directrendering, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #ifdef HAVE_AA {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption},
--- a/dec_video.c Wed Mar 20 15:38:13 2002 +0000 +++ b/dec_video.c Wed Mar 20 15:39:08 2002 +0000 @@ -802,7 +802,7 @@ return 1; } -extern int vaa_use_dr; +extern int vo_directrendering; static int use_dr=0,use_dr_422=0; static bes_da_t bda; @@ -813,7 +813,7 @@ memset(&bda,0,sizeof(bes_da_t)); if(vo_vaa.query_bes_da) use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1; - if(!vaa_use_dr) use_dr = 0; + if(!vo_directrendering) use_dr = 0; if(use_dr) { uint32_t sstride,dstride;
--- a/libmpcodecs/dec_video.c Wed Mar 20 15:38:13 2002 +0000 +++ b/libmpcodecs/dec_video.c Wed Mar 20 15:39:08 2002 +0000 @@ -148,7 +148,7 @@ return 0; } -extern int vaa_use_dr; +extern int vo_directrendering; int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ mp_image_t *mpi=NULL;
--- a/libmpcodecs/vd.c Wed Mar 20 15:38:13 2002 +0000 +++ b/libmpcodecs/vd.c Wed Mar 20 15:39:08 2002 +0000 @@ -88,7 +88,7 @@ }; #include "libvo/video_out.h" -extern int vaa_use_dr; +extern int vo_directrendering; // libvo opts: int fullscreen=0; @@ -286,7 +286,7 @@ // check libvo first! vo_functions_t* vo=sh->video_out; - if(vo && vaa_use_dr) vo->control(VOCTRL_GET_IMAGE,mpi); + if(vo && vo_directrendering) vo->control(VOCTRL_GET_IMAGE,mpi); if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // non-direct and not yet allocaed image. allocate it!
--- a/libvo/video_out.c Wed Mar 20 15:38:13 2002 +0000 +++ b/libvo/video_out.c Wed Mar 20 15:39:08 2002 +0000 @@ -59,7 +59,7 @@ float vo_fps=0; // for mp1e rte char *vo_subdevice = NULL; -int vaa_use_dr=1; +int vo_directrendering=1; /**************************************** * GAMMA CORRECTION * ****************************************/