diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-05 16:40:14 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-05 16:40:14 +0000 |
commit | d9a8b46e5c1bdca2c32038102c656940680429b1 (patch) | |
tree | c5f8918e9cade604a4f59546fed5a7d91c0f1085 | |
parent | f215e84339c597f967c157f7e219fde3eb831b47 (diff) | |
download | mpv-d9a8b46e5c1bdca2c32038102c656940680429b1.tar.bz2 mpv-d9a8b46e5c1bdca2c32038102c656940680429b1.tar.xz |
aic & umv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9537 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/tech/libavc-options.txt | 6 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/DOCS/tech/libavc-options.txt b/DOCS/tech/libavc-options.txt index c26d8da3eb..db1636dddf 100644 --- a/DOCS/tech/libavc-options.txt +++ b/DOCS/tech/libavc-options.txt @@ -346,6 +346,12 @@ subq (1-8) subpel refinement quality (for qpel) psnr will print the psnr for the whole video after encoding and store the per frame psnr in a file with name like "psnr_012345.log" + +aic advanced intra prediction (H.263+ only) + Note: vqmin should be 8 or larger + +umv unlimited MVs (H.263+ only) + allow encoding of abritary long MVs lavdopts: (decoder options) diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index cb618767ae..d8438b2d58 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -114,6 +114,8 @@ static int lavc_param_pre_dia_size= 0; static int lavc_param_dia_size= 0; static int lavc_param_qpel= 0; static int lavc_param_trell= 0; +static int lavc_param_aic= 0; +static int lavc_param_umv= 0; static int lavc_param_last_pred= 0; static int lavc_param_pre_me= 1; static int lavc_param_me_subpel_quality= 8; @@ -195,6 +197,10 @@ struct config lavcopts_conf[]={ {"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, {"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, {"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL}, +#ifdef CODEC_FLAG_H263P_AIC + {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC, NULL}, + {"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV, NULL}, +#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif @@ -367,6 +373,8 @@ static int config(struct vf_instance_s* vf, #if LIBAVCODEC_BUILD >= 4648 lavc_venc_context->flags|= lavc_param_trell; #endif + lavc_venc_context->flags|= lavc_param_aic; + lavc_venc_context->flags|= lavc_param_umv; lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0; lavc_venc_context->flags|= lavc_param_data_partitioning; if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY; @@ -490,6 +498,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size, pic); + muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0); #if LIBAVCODEC_BUILD >= 4643 |