ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat May 9 23:43:43 2015 +0200| [b62297805b5fd7c67ada8d913b3b10ee86dcb569] | committer: Michael Niedermayer
avcodec/snowenc: add intra_penalty AVOption This allows favoring intra or inter blocks by a user specified amount. Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b62297805b5fd7c67ada8d913b3b10ee86dcb569 --- libavcodec/snow.h | 1 + libavcodec/snowenc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index f5cbae3..95e07cd 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -175,6 +175,7 @@ typedef struct SnowContext{ slice_buffer sb; int memc_only; int no_bitstream; + int intra_penalty; MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ea5e544..db8ab76 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -912,7 +912,7 @@ static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int block->type &= ~BLOCK_INTRA; } - rd= get_block_rd(s, mb_x, mb_y, 0, obmc_edged); + rd= get_block_rd(s, mb_x, mb_y, 0, obmc_edged) + s->intra_penalty * !!intra; //FIXME chroma if(rd < *best_rd){ @@ -1877,6 +1877,7 @@ static const AVOption options[] = { FF_MPV_COMMON_OPTS { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "intra_penalty", "Penalty for intra blocks in block decission", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { NULL }, }; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
