# HG changeset patch # User michael # Date 1259876218 0 # Node ID 703cfed3132059e70d036b393d10984a5f6aa337 # Parent 2938c3bc34c7848e5ab88b6d4e86da0e1d119e3b Move ff_init_qscale_tab() from h263.c to mpegvideo, the function is not h263 specific. diff -r 2938c3bc34c7 -r 703cfed31320 h263.c --- a/h263.c Thu Dec 03 19:19:57 2009 +0000 +++ b/h263.c Thu Dec 03 21:36:58 2009 +0000 @@ -504,20 +504,6 @@ } /** - * init s->current_picture.qscale_table from s->lambda_table - */ -static void ff_init_qscale_tab(MpegEncContext *s){ - int8_t * const qscale_table= s->current_picture.qscale_table; - int i; - - for(i=0; imb_num; i++){ - unsigned int lam= s->lambda_table[ s->mb_index2xy[i] ]; - int qp= (lam*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7); - qscale_table[ s->mb_index2xy[i] ]= av_clip(qp, s->avctx->qmin, s->avctx->qmax); - } -} - -/** * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2) */ void ff_clean_h263_qscales(MpegEncContext *s){ diff -r 2938c3bc34c7 -r 703cfed31320 mpegvideo.h --- a/mpegvideo.h Thu Dec 03 19:19:57 2009 +0000 +++ b/mpegvideo.h Thu Dec 03 21:36:58 2009 +0000 @@ -855,6 +855,7 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s); int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); +void ff_init_qscale_tab(MpegEncContext *s); /* rv10.c */ diff -r 2938c3bc34c7 -r 703cfed31320 mpegvideo_enc.c --- a/mpegvideo_enc.c Thu Dec 03 19:19:57 2009 +0000 +++ b/mpegvideo_enc.c Thu Dec 03 21:36:58 2009 +0000 @@ -146,6 +146,20 @@ put_bits(pb, 1, 0); } +/** + * init s->current_picture.qscale_table from s->lambda_table + */ +void ff_init_qscale_tab(MpegEncContext *s){ + int8_t * const qscale_table= s->current_picture.qscale_table; + int i; + + for(i=0; imb_num; i++){ + unsigned int lam= s->lambda_table[ s->mb_index2xy[i] ]; + int qp= (lam*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7); + qscale_table[ s->mb_index2xy[i] ]= av_clip(qp, s->avctx->qmin, s->avctx->qmax); + } +} + static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){ int i;