diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2006-05-30 04:51:58 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2006-05-30 04:51:58 +0000 |
| commit | 383f62fdfe530125d97651c4f1c337890b2c16cd (patch) | |
| tree | 71f0d6cec28078092b5a969446b4dbe5ad722155 /libavcodec/snow.c | |
| parent | b29183a1504d47479ece9d9625ab8ed2f62b8c56 (diff) | |
Snow: 10l. 1pass ratecontrol failed to set snow's internal quant.
Originally committed as revision 5426 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 500e6fdb46..daac0107e6 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3912,6 +3912,11 @@ static int common_init(AVCodecContext *avctx){ return 0; } +static int qscale2qlog(int qscale){ + return rint(QROOT*log(qscale / (float)FF_QP2LAMBDA)/log(2)) + + 61*QROOT/8; //<64 >60 +} + static void ratecontrol_1pass(SnowContext *s, AVFrame *pict) { /* estimate the frame's complexity as a sum of weighted dwt coefs. @@ -3955,6 +3960,7 @@ static void ratecontrol_1pass(SnowContext *s, AVFrame *pict) pict->quality= ff_rate_estimate_qscale(&s->m, 1); s->lambda= pict->quality * 3/2; + s->qlog= qscale2qlog(pict->quality); } static void calculate_vissual_weight(SnowContext *s, Plane *p){ @@ -4016,7 +4022,7 @@ static int encode_init(AVCodecContext *avctx) if(!avctx->stats_out) avctx->stats_out = av_mallocz(256); } - if(!(avctx->flags&CODEC_FLAG_QSCALE)){ + if((avctx->flags&CODEC_FLAG_PASS2) || !(avctx->flags&CODEC_FLAG_QSCALE)){ if(ff_rate_control_init(&s->m) < 0) return -1; } @@ -4138,9 +4144,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, if(s->pass1_rc && avctx->frame_number == 0) pict->quality= 2*FF_QP2LAMBDA; if(pict->quality){ - s->qlog= rint(QROOT*log(pict->quality / (float)FF_QP2LAMBDA)/log(2)); - //<64 >60 - s->qlog += 61*QROOT/8; + s->qlog= qscale2qlog(pict->quality); s->lambda = pict->quality * 3/2; } if(s->qlog < 0 || (!pict->quality && (avctx->flags & CODEC_FLAG_QSCALE))){ |