mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully
Originally committed as revision 959 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e8b62df6e4
commit
b3a391e8b8
2
ffmpeg.c
2
ffmpeg.c
@ -104,7 +104,7 @@ static int video_rc_min_rate=0;
|
|||||||
static float video_rc_initial_cplx=0;
|
static float video_rc_initial_cplx=0;
|
||||||
static float video_b_qfactor = 1.25;
|
static float video_b_qfactor = 1.25;
|
||||||
static float video_b_qoffset = 1.25;
|
static float video_b_qoffset = 1.25;
|
||||||
static float video_i_qfactor = -0.5;
|
static float video_i_qfactor = -0.8;
|
||||||
static float video_i_qoffset = 0.0;
|
static float video_i_qoffset = 0.0;
|
||||||
static int me_method = 0;
|
static int me_method = 0;
|
||||||
static int video_disable = 0;
|
static int video_disable = 0;
|
||||||
|
@ -3296,7 +3296,7 @@ void add_codec(FFStream *stream, AVCodecContext *av)
|
|||||||
if (!av->rc_eq)
|
if (!av->rc_eq)
|
||||||
av->rc_eq = "tex^qComp";
|
av->rc_eq = "tex^qComp";
|
||||||
if (!av->i_quant_factor)
|
if (!av->i_quant_factor)
|
||||||
av->i_quant_factor = 0.8;
|
av->i_quant_factor = -0.8;
|
||||||
if (!av->b_quant_factor)
|
if (!av->b_quant_factor)
|
||||||
av->b_quant_factor = 1.25;
|
av->b_quant_factor = 1.25;
|
||||||
if (!av->b_quant_offset)
|
if (!av->b_quant_offset)
|
||||||
|
@ -430,6 +430,8 @@ typedef struct AVCodecContext {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* qscale offset between ip and b frames
|
* qscale offset between ip and b frames
|
||||||
|
* if > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset)
|
||||||
|
* if < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset)
|
||||||
* encoding: set by user.
|
* encoding: set by user.
|
||||||
* decoding: unused
|
* decoding: unused
|
||||||
*/
|
*/
|
||||||
@ -589,6 +591,8 @@ typedef struct AVCodecContext {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* qscale offset between p and i frames
|
* qscale offset between p and i frames
|
||||||
|
* if > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset)
|
||||||
|
* if < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset)
|
||||||
* encoding: set by user.
|
* encoding: set by user.
|
||||||
* decoding: unused
|
* decoding: unused
|
||||||
*/
|
*/
|
||||||
|
@ -59,7 +59,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
|
|||||||
s->max_qdiff= 3;
|
s->max_qdiff= 3;
|
||||||
s->b_quant_factor=1.25;
|
s->b_quant_factor=1.25;
|
||||||
s->b_quant_offset=1.25;
|
s->b_quant_offset=1.25;
|
||||||
s->i_quant_factor=0.8;
|
s->i_quant_factor=-0.8;
|
||||||
s->i_quant_offset=0.0;
|
s->i_quant_offset=0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user