Mercurial > libavcodec.hg
changeset 2990:0300c2647bc3 libavcodec
support downscaling frames for dynamic b frame decission
| author | michael |
|---|---|
| date | Sun, 25 Dec 2005 18:34:02 +0000 |
| parents | c6e656e76eed |
| children | d377b0788381 |
| files | avcodec.h mpegvideo.c utils.c |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/avcodec.h Sun Dec 25 17:43:52 2005 +0000 +++ b/avcodec.h Sun Dec 25 18:34:02 2005 +0000 @@ -1869,6 +1869,13 @@ * - decoding: unused */ int bidir_refine; + + /** + * + * - encoding: set by user. + * - decoding: unused + */ + int brd_scale; } AVCodecContext; /**
--- a/mpegvideo.c Sun Dec 25 17:43:52 2005 +0000 +++ b/mpegvideo.c Sun Dec 25 18:34:02 2005 +0000 @@ -2145,9 +2145,9 @@ AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id); AVCodecContext *c= avcodec_alloc_context(); AVFrame input[FF_MAX_B_FRAMES+2]; - const int scale= 0; + const int scale= s->avctx->brd_scale; int i, j, out_size; - int outbuf_size= (s->width * s->height) >> (2*scale); //FIXME + int outbuf_size= s->width * s->height; //FIXME uint8_t *outbuf= av_malloc(outbuf_size); ImgReSampleContext *resample; int64_t best_rd= INT64_MAX; @@ -2198,6 +2198,7 @@ input[0].pict_type= I_TYPE; input[0].quality= 2 * FF_QP2LAMBDA; out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[0]); + rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT; for(i=0; i<s->max_b_frames+1; i++){ int is_p= i % (j+1) == j || i==s->max_b_frames;
--- a/utils.c Sun Dec 25 17:43:52 2005 +0000 +++ b/utils.c Sun Dec 25 18:34:02 2005 +0000 @@ -708,6 +708,7 @@ {"mb_lmax", NULL, OFFSET(mb_lmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"me_penalty_compensation", NULL, OFFSET(me_penalty_compensation), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"bidir_refine", NULL, OFFSET(bidir_refine), FF_OPT_TYPE_INT, DEFAULT, 0, 4, V|E}, +{"brd_scale", NULL, OFFSET(brd_scale), FF_OPT_TYPE_INT, DEFAULT, 0, 10, V|E}, {NULL}, };