RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vismv, alt, ilme options 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11703 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2003-12-30 18:24:19 +00:00
parent b00702fd6a
commit bf3a3d36e4
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DOCS/man/en/mplayer.1
View File

@ -2162,6 +2162,18 @@ debug:
.br
0x1000: bugs
.REss
.IPs vismv=<value>
vismv:
.RSss
.br
0: disabled
.br
1: visualize forward predicted MVs of P frames
.br
2: visualize forward predicted MVs of B frames
.br
4: visualize backward predicted MVs of B frames
.REss
.IPs bug=<value>
manually work around encoder bugs:
.RSss
@ -4279,6 +4291,12 @@ average.
.B ildct\ \
use interlaced dct
.TP
.B ilme\ \ \
use interlaced motion estimation
.TP
.B alt\ \ \ \
use alternative scantable
.TP
.B top=<-1\-1>\ \ \
.RSs
.IPs -1

7
libmpcodecs/vd_ffmpeg.c
View File

@ -98,6 +98,7 @@ static int lavc_param_gray=0;
static int lavc_param_vstats=0;
static int lavc_param_idct_algo=0;
static int lavc_param_debug=0;
static int lavc_param_vismv=0;
m_option_t lavc_decode_opts_conf[]={
{"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL},
@ -106,9 +107,8 @@ m_option_t lavc_decode_opts_conf[]={
{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#if LIBAVCODEC_BUILD >= 4642
{"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
#endif
{"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@ -224,6 +224,9 @@ static int init(sh_video_t *sh){
avctx->error_concealment= lavc_param_error_concealment;
#if LIBAVCODEC_BUILD >= 4642
avctx->debug= lavc_param_debug;
#endif
#if LIBAVCODEC_BUILD >= 4698
avctx->debug_mv= lavc_param_vismv;
#endif
mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);
/* AVRn stores huffman table in AVI header */

10
libmpcodecs/ve_lavc.c
View File

@ -142,6 +142,8 @@ static int lavc_param_inter_threshold= 0;
static int lavc_param_sc_threshold= 0;
static int lavc_param_ss= 0;
static int lavc_param_top= -1;
static int lavc_param_alt= 0;
static int lavc_param_ilme= 0;
char *lavc_param_acodec = "mp2";
@ -268,6 +270,12 @@ m_option_t lavcopts_conf[]={
#endif
#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
{"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT, NULL},
#endif
#ifdef CODEC_FLAG_ALT_SCAN
{"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN, NULL},
#endif
#ifdef CODEC_FLAG_INTERLACED_ME
{"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL},
#endif
{"inter_threshold", &lavc_param_inter_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL},
{"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL},
@ -549,6 +557,8 @@ static int config(struct vf_instance_s* vf,
lavc_venc_context->flags|= lavc_param_mv0;
lavc_venc_context->flags|= lavc_param_qp_rd;
lavc_venc_context->flags|= lavc_param_ss;
lavc_venc_context->flags|= lavc_param_alt;
lavc_venc_context->flags|= lavc_param_ilme;
if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;
if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;