diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-03 09:28:58 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-03 09:28:58 +0000 |
commit | 104c125e6d512736abb1e07a60071da06b984548 (patch) | |
tree | cf546899c35d9042528724dd346c5adf0678bdec | |
parent | c4d519e1938327e2771f7a8e7d262adaca62c578 (diff) | |
download | mpv-104c125e6d512736abb1e07a60071da06b984548.tar.bz2 mpv-104c125e6d512736abb1e07a60071da06b984548.tar.xz |
Allows to users control direct rendering
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4495 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-mplayer.h | 3 | ||||
-rw-r--r-- | dec_video.c | 2 | ||||
-rw-r--r-- | libvo/video_out.c | 1 | ||||
-rw-r--r-- | mencoder.c | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 7ae9992d30..c547639ffb 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -47,6 +47,7 @@ extern int vo_gamma_hue; extern int vo_gamma_red_intensity; extern int vo_gamma_green_intensity; extern int vo_gamma_blue_intensity; +extern int vaa_use_dr; #endif #ifdef USE_SUB @@ -254,6 +255,8 @@ static config_t mplayer_opts[]={ {"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 #ifdef HAVE_AA diff --git a/dec_video.c b/dec_video.c index f47204d983..d521724dc0 100644 --- a/dec_video.c +++ b/dec_video.c @@ -747,6 +747,7 @@ if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24)) return 1; } +extern int vaa_use_dr; #ifdef USE_LIBVO2 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ #else @@ -776,6 +777,7 @@ painted = 0; use_dr = 0; if(vo_vaa.query_bes_da) use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1; + if(!vaa_use_dr) use_dr = 0; #ifdef USE_MP_IMAGE if(mpi->type!=MP_IMGTYPE_EXPORT) if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){ diff --git a/libvo/video_out.c b/libvo/video_out.c index fee4b188b6..1b4c22402d 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -47,6 +47,7 @@ int vo_pts=0; // for hw decoding float vo_fps=0; // for mp1e rte char *vo_subdevice = NULL; +int vaa_use_dr=1; /**************************************** * GAMMA CORRECTION * ****************************************/ diff --git a/mencoder.c b/mencoder.c index 946cb2d496..61381c48c7 100644 --- a/mencoder.c +++ b/mencoder.c @@ -93,6 +93,7 @@ int lavc_param_keyint = -1; **************************************************************************/ vo_vaa_t vo_vaa; int vo_doublebuffering; +int vaa_use_dr; //-------------------------- |