aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-05 23:44:51 +0000
committerGravatar michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-05 23:44:51 +0000
commitb9f282731d6d478081acfe8c31f54c1467c05332 (patch)
tree8c87e50d3025b5b727eac367288571a6e63221d3
parent6ac86c2a912ed5481149ad86a1e752c8255988c6 (diff)
ildctcmp, VSAD, VSSE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11754 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/man/en/mplayer.17
-rw-r--r--libmpcodecs/ve_lavc.c9
2 files changed, 16 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 88d63f0b08..ea0bcefe24 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -4608,6 +4608,9 @@ large context model
use quarter pel motion compensation
Tip: This seems only useful for high bitrate encodings.
.TP
+.B ildctcmp=<0\-2000>
+comparison function for interlaced dct decision
+.TP
.B precmp=<0\-2000>
comparison function for motion estimation pre pass
.TP
@@ -4637,6 +4640,10 @@ number of bits needed for the block
rate distortion optimal, slow
.IPs "7 (ZERO)"
0
+.IPs "8 (VSAD)"
+sum of absolute vertical differences
+.IPs "9 (VSSE)"
+sum of squared vertical differences
.IPs +256\
use chroma too, doesn't work (correctly) with B frames currently
.RE
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index bd8f2bd2ea..9a81428b45 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -113,6 +113,9 @@ static int lavc_param_me_pre_cmp= 0;
static int lavc_param_me_cmp= 0;
static int lavc_param_me_sub_cmp= 0;
static int lavc_param_mb_cmp= 0;
+#ifdef FF_CMP_VSAD
+static int lavc_param_ildct_cmp= FF_CMP_VSAD;
+#endif
static int lavc_param_pre_dia_size= 0;
static int lavc_param_dia_size= 0;
static int lavc_param_qpel= 0;
@@ -223,6 +226,9 @@ m_option_t lavcopts_conf[]={
{"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
{"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
{"mbcmp", &lavc_param_mb_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+#ifdef FF_CMP_VSAD
+ {"ildctcmp", &lavc_param_ildct_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
+#endif
{"predia", &lavc_param_pre_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
{"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
{"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL},
@@ -540,6 +546,9 @@ static int config(struct vf_instance_s* vf,
lavc_venc_context->me_cmp= lavc_param_me_cmp;
lavc_venc_context->me_sub_cmp= lavc_param_me_sub_cmp;
lavc_venc_context->mb_cmp= lavc_param_mb_cmp;
+#ifdef FF_CMP_VSAD
+ lavc_venc_context->ildct_cmp= lavc_param_ildct_cmp;
+#endif
lavc_venc_context->dia_size= lavc_param_dia_size;
lavc_venc_context->flags|= lavc_param_qpel;
#endif