From 899bf1b58ebf96b9840f3a222b19c9b17ab547d7 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 20 Nov 2002 13:16:09 +0000 Subject: =?UTF-8?q?aspect=20ratio=20clenaup=20&=20a/b=20type=20aspect=20ar?= =?UTF-8?q?gument=20patch=20from=20(R=C3=A9mi=20Guyomarch=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8238 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ve_lavc.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'libmpcodecs/ve_lavc.c') diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 94eec2c36a..767160e09d 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "../config.h" @@ -83,7 +84,7 @@ static int lavc_param_mpeg_quant=0; static int lavc_param_fdct=0; static int lavc_param_idct=0; #if LIBAVCODEC_BUILD >= 4623 -static float lavc_param_aspect=0.0; +static char* lavc_param_aspect = NULL; #endif static float lavc_param_lumi_masking= 0.0; static float lavc_param_dark_masking= 0.0; @@ -151,7 +152,7 @@ struct config lavcopts_conf[]={ {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, #endif #if LIBAVCODEC_BUILD >= 4623 - {"aspect", &lavc_param_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, + {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif #if LIBAVCODEC_BUILD >= 4625 {"lumi_mask", &lavc_param_lumi_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, @@ -289,27 +290,27 @@ static int config(struct vf_instance_s* vf, lavc_venc_context->dark_masking= lavc_param_dark_masking; #endif -#if LIBAVCODEC_BUILD >= 4623 - if (lavc_param_aspect != 0.0) +#if LIBAVCODEC_BUILD >= 4640 + if (lavc_param_aspect != NULL) { - /* 625 means CIF */ - if (lavc_param_aspect == (float)(4.0/3.0)) - lavc_venc_context->aspect_ratio_info = FF_ASPECT_4_3_625; - else if (lavc_param_aspect == (float)(16.0/9.0)) - lavc_venc_context->aspect_ratio_info = FF_ASPECT_16_9_625; - else if (lavc_param_aspect == (float)(221.0/100.0)) - { - lavc_venc_context->aspect_ratio_info = FF_ASPECT_EXTENDED; - lavc_venc_context->aspected_width = 221; - lavc_venc_context->aspected_height = 100; + int par_width, par_height, e; + float ratio=0; + + e= sscanf (lavc_param_aspect, "%d/%d", &par_width, &par_height); + if(e==2){ + if(par_height) + ratio= (float)par_width / (float)par_height; + }else{ + e= sscanf (lavc_param_aspect, "%f", &ratio); } - else - { - printf("Unsupported aspect ratio (%f)\n", lavc_param_aspect); + + if (e && ratio > 0.1 && ratio < 10.0) { + lavc_venc_context->aspect_ratio= ratio; + mp_dbg(MSGT_MENCODER, MSGL_DBG2, "aspect_ratio: %f\n", ratio); + } else { + mp_dbg(MSGT_MENCODER, MSGL_ERR, "aspect ratio: cannot parse \"%s\"\n", lavc_param_aspect); + return 0; } - mp_dbg(MSGT_MENCODER, MSGL_DBG2, "aspect_ratio_info: %d\n", lavc_venc_context->aspect_ratio_info); - mp_dbg(MSGT_MENCODER, MSGL_DBG2, "par_width: %d\n", lavc_venc_context->aspected_width); - mp_dbg(MSGT_MENCODER, MSGL_DBG2, "par_height: %d\n", lavc_venc_context->aspected_height); } #endif -- cgit v1.2.3