Allows to users control direct rendering

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4495 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nick 2002-02-03 09:28:58 +00:00
parent c4d519e193
commit 104c125e6d
4 changed files with 7 additions and 0 deletions

View File

@ -47,6 +47,7 @@ extern int vo_gamma_hue;
extern int vo_gamma_red_intensity; extern int vo_gamma_red_intensity;
extern int vo_gamma_green_intensity; extern int vo_gamma_green_intensity;
extern int vo_gamma_blue_intensity; extern int vo_gamma_blue_intensity;
extern int vaa_use_dr;
#endif #endif
#ifdef USE_SUB #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}, {"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}, {"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}, {"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 #endif
#ifdef HAVE_AA #ifdef HAVE_AA

View File

@ -747,6 +747,7 @@ if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24))
return 1; return 1;
} }
extern int vaa_use_dr;
#ifdef USE_LIBVO2 #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){ int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
#else #else
@ -776,6 +777,7 @@ painted = 0;
use_dr = 0; use_dr = 0;
if(vo_vaa.query_bes_da) if(vo_vaa.query_bes_da)
use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1; use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1;
if(!vaa_use_dr) use_dr = 0;
#ifdef USE_MP_IMAGE #ifdef USE_MP_IMAGE
if(mpi->type!=MP_IMGTYPE_EXPORT) if(mpi->type!=MP_IMGTYPE_EXPORT)
if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){ if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){

View File

@ -47,6 +47,7 @@ int vo_pts=0; // for hw decoding
float vo_fps=0; // for mp1e rte float vo_fps=0; // for mp1e rte
char *vo_subdevice = NULL; char *vo_subdevice = NULL;
int vaa_use_dr=1;
/**************************************** /****************************************
* GAMMA CORRECTION * * GAMMA CORRECTION *
****************************************/ ****************************************/

View File

@ -93,6 +93,7 @@ int lavc_param_keyint = -1;
**************************************************************************/ **************************************************************************/
vo_vaa_t vo_vaa; vo_vaa_t vo_vaa;
int vo_doublebuffering; int vo_doublebuffering;
int vaa_use_dr;
//-------------------------- //--------------------------