RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffserver_config: remove useless defaults 

Options are already set to its defaults by AVOption API.
The only difference is for qmin, new default is 2, ffserver set to 3.
It is dead code because if condition is not meet unless user set option to 0.
Meeting condition would mean that ffserver overwrites explicity set option.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-11-26 18:54:16 +01:00
parent 8b0226f2a6
commit c8ac46e924
1 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ffserver_config.c
View File

@ -234,56 +234,11 @@ static void add_codec(FFServerStream *stream, AVCodecContext *av,
(int64_t)av->bit_rate*av->time_base.num/av->time_base.den);
av_dict_set_int(&recommended, "bt", av->bit_rate_tolerance, 0);
}
if (av->qmin == 0) {
av->qmin = 3;
av_dict_set_int(&recommended, "qmin", av->qmin, 0);
}
if (av->qmax == 0) {
av->qmax = 31;
av_dict_set_int(&recommended, "qmax", av->qmax, 0);
}
if (av->max_qdiff == 0) {
av->max_qdiff = 3;
av_dict_set_int(&recommended, "qdiff", av->max_qdiff, 0);
}
/*FIXME: 0.5 is a default for these two, it is a dead code */
av->qcompress = 0.5;
av_dict_set(&recommended, "qcomp", "0.5", 0);
av->qblur = 0.5;
av_dict_set(&recommended, "qblur", "0.5", 0);
if (!av->nsse_weight) {
av->nsse_weight = 8;
av_dict_set_int(&recommended, "nssew", av->nsse_weight, 0);
}
av->frame_skip_cmp = FF_CMP_DCTMAX;
av_dict_set_int(&recommended, "skipcmp", FF_CMP_DCTMAX, 0);
if (!av->me_method) {
av->me_method = ME_EPZS;
av_dict_set_int(&recommended, "me_method", ME_EPZS, 0);
}
/* FIXME: rc_buffer_aggressivity and rc_eq are deprecated */
av->rc_buffer_aggressivity = 1.0;
av_dict_set(&recommended, "rc_buf_aggressivity", "1.0", 0);
if (!av->rc_eq) {
av->rc_eq = av_strdup("tex^qComp");
av_dict_set(&recommended, "rc_eq", "tex^qComp", 0);
}
if (!av->i_quant_factor) {
av->i_quant_factor = -0.8;
av_dict_set(&recommended, "i_qfactor", "-0.8", 0);
}
if (!av->b_quant_factor) {
av->b_quant_factor = 1.25;
av_dict_set(&recommended, "b_qfactor", "1.25", 0);
}
if (!av->b_quant_offset) {
av->b_quant_offset = 1.25;
av_dict_set(&recommended, "b_qoffset", "1.25", 0);
}
if (!av->rc_max_rate) {
av->rc_max_rate = av->bit_rate * 2;
av_dict_set_int(&recommended, "maxrate", av->rc_max_rate, 0);