motion estimation bitrate penalty compensation
Originally committed as revision 4092 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
048bfeeb12
commit
09c3e44e8a
4 changed files with 14 additions and 1 deletions
|
|
@ -17,7 +17,7 @@ extern "C" {
|
|||
|
||||
#define FFMPEG_VERSION_INT 0x000409
|
||||
#define FFMPEG_VERSION "0.4.9-pre1"
|
||||
#define LIBAVCODEC_BUILD 4749
|
||||
#define LIBAVCODEC_BUILD 4750
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
|
||||
#define LIBAVCODEC_VERSION FFMPEG_VERSION
|
||||
|
|
@ -1781,6 +1781,13 @@ typedef struct AVCodecContext {
|
|||
* - decoding: unused
|
||||
*/
|
||||
int mb_lmax;
|
||||
|
||||
/**
|
||||
*
|
||||
* - encoding: set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
int me_penalty_compensation;
|
||||
} AVCodecContext;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5251,6 +5251,8 @@ static void encode_picture(MpegEncContext *s, int picture_number)
|
|||
|
||||
/* Estimate motion for every MB */
|
||||
if(s->pict_type != I_TYPE){
|
||||
s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8;
|
||||
s->lambda2= (s->lambda2* s->avctx->me_penalty_compensation + 128)>>8;
|
||||
if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){
|
||||
if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){
|
||||
s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
|
||||
|
|
|
|||
|
|
@ -458,6 +458,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
|
|||
s->ildct_cmp= FF_CMP_VSAD;
|
||||
s->profile= FF_PROFILE_UNKNOWN;
|
||||
s->level= FF_LEVEL_UNKNOWN;
|
||||
s->me_penalty_compensation= 256;
|
||||
|
||||
s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
|
||||
s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue