On 06/18/2011 08:52 AM, Anton Khirnov wrote:
> It should be replaced with proper per-codec defaults.
> ---
> libavcodec/options.c | 2 +-
> tests/lavf-regression.sh | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/options.c b/libavcodec/options.c
> index 545887a..a876ce0 100644
> --- a/libavcodec/options.c
> +++ b/libavcodec/options.c
> @@ -69,7 +69,7 @@ static const AVOption *opt_find(void *obj, const char
> *name, const char *unit, i
>
> static const AVOption options[]={
> {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl =
> AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|E},
> -{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl =
> 64*1000 }, INT_MIN, INT_MAX, A|E},
> +{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl =
> AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, A|E},
> {"bt", "set video bitrate tolerance (in bits/s)",
> OFFSET(bit_rate_tolerance), FF_OPT_TYPE_INT, {.dbl =
> AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E},
> {"flags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0,
> UINT_MAX, V|A|E|D, "flags"},
> {"mv4", "use four motion vector by macroblock (mpeg4)", 0,
> FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"},
> diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
> index 39e752b..fdfa02c 100755
> --- a/tests/lavf-regression.sh
> +++ b/tests/lavf-regression.sh
> @@ -14,7 +14,7 @@ eval do_$test=y
> do_lavf()
> {
> file=${outfile}lavf.$1
> - do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS
> -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2
> + do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS
> -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -ab 64k -t 1 -qscale 10 $2
> do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file $3
> }
>
> @@ -55,7 +55,7 @@ fi
>
> if [ -n "$do_rm" ] ; then
> file=${outfile}lavf.rm
> -do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar
> 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed
> +do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar
> 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k
> # broken
> #do_ffmpeg_crc $file -i $target_path/$file
> fi
Those 2 are ok I guess.
> @@ -66,7 +66,7 @@ fi
>
> if [ -n "$do_mxf" ] ; then
> do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
> -do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32
> -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2
> +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use
> 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000
> -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
> +do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32
> -vcodec mpeg2video -intra -flags +ildct+low_delay+bitexact -dc 10 -flags2
> +ivlc+non_linear_q -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use
> 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000
> -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
> fi
>
> if [ -n "$do_ts" ] ; then
This one seems unrelated. And doesn't COMMON_OPTS already set the
bitexact flag?
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
