From 216d10cf2d86cee64fa7a4e1c5f1432ad1b8488d Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 4 Dec 2002 12:41:57 +0000 Subject: specific debug output support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8342 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 8 +++++++- libmpcodecs/ve_lavc.c | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 17cfa9f03e..6ee7370e2e 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -70,6 +70,7 @@ static int lavc_param_error_concealment=3; 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; struct config lavc_decode_opts_conf[]={ {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL}, @@ -78,6 +79,9 @@ struct config 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 {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -164,7 +168,9 @@ static int init(sh_video_t *sh){ avctx->fourcc= sh->format; avctx->idct_algo= lavc_param_idct_algo; avctx->error_concealment= lavc_param_error_concealment; - +#if LIBAVCODEC_BUILD >= 4642 + avctx->debug= lavc_param_debug; +#endif mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height); /* AVRn stores huffman table in AVI header */ /* Pegasus MJPEG stores it also in AVI header, but it uses the common diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 967e4c8507..40355a617a 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -93,6 +93,7 @@ static int lavc_param_normalize_aqp= 0; static int lavc_param_interlaced_dct= 0; static int lavc_param_prediction_method= FF_PRED_LEFT; static char *lavc_param_format="YV12"; +static int lavc_param_debug= 0; #include "cfgparser.h" @@ -148,6 +149,9 @@ struct config lavcopts_conf[]={ {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, {"format", &lavc_param_format, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#if LIBAVCODEC_BUILD >= 4642 + {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL}, +#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif @@ -214,6 +218,9 @@ static int config(struct vf_instance_s* vf, lavc_venc_context->rc_buffer_size= lavc_param_rc_buffer_size*1000; lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; +#if LIBAVCODEC_BUILD >= 4642 + lavc_venc_context->debug= lavc_param_debug; +#endif p= lavc_param_rc_override_string; for(i=0; p; i++){ -- cgit v1.2.3