[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.328,1.329
Michael Niedermayer CVS
michael
Sun May 22 00:03:26 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv3005
Modified Files:
ffmpeg.c
Log Message:
b frame strategy
set emu edge if lowres
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- ffmpeg.c 12 May 2005 16:28:24 -0000 1.328
+++ ffmpeg.c 21 May 2005 22:03:24 -0000 1.329
@@ -141,6 +141,7 @@
static int video_codec_tag = 0;
static int same_quality = 0;
static int b_frames = 0;
+static int b_strategy = 0;
static int mb_decision = FF_MB_DECISION_SIMPLE;
static int ildct_cmp = FF_CMP_VSAD;
static int mb_cmp = FF_CMP_SAD;
@@ -2944,6 +2945,7 @@
enc->debug = debug;
enc->debug_mv = debug_mv;
enc->lowres= lowres;
+ if(lowres) enc->flags |= CODEC_FLAG_EMU_EDGE;
if(bitexact)
enc->flags|= CODEC_FLAG_BITEXACT;
if(me_threshold)
@@ -3241,7 +3243,7 @@
}
if (b_frames) {
video_enc->max_b_frames = b_frames;
- video_enc->b_frame_strategy = 0;
+ video_enc->b_frame_strategy = b_strategy;
video_enc->b_quant_factor = 2.0;
}
if (do_interlace_dct) {
@@ -3997,7 +3999,7 @@
{ "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
{ "ibias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ibias}, "intra quant bias", "bias" },
{ "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" },
-// { "b_strategy", HAS_ARG | OPT_EXPERT, {(void*)opt_b_strategy}, "dynamic b frame selection strategy", "strategy" },
+ { "b_strategy", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&b_strategy}, "dynamic b frame selection strategy", "strategy" },
{ "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" },
{ "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" },
{ "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
More information about the ffmpeg-cvslog
mailing list