diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2006-01-21 02:35:03 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2006-01-21 02:35:03 +0000 |
| commit | 48d1b9a17c7ff9c622e9e0bf9806ca3552e8bf4d (patch) | |
| tree | 86f7744c7c61a7dd785cc1eddc605fb9fa9d7581 /libavcodec | |
| parent | 3de79d0dca959236c1b232d421cb8442a18784cc (diff) | |
| download | ffmpeg-48d1b9a17c7ff9c622e9e0bf9806ca3552e8bf4d.tar.gz | |
fix convergence of snow iterative_me
Originally committed as revision 4876 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/snow.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 4a96f3e0d2..c375b3d4d3 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3145,6 +3145,8 @@ static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, con */ rate += get_block_bits(s, mb_x + (i&1) - (i>>1), mb_y + (i>>1), 1); } + if(mb_x == b_stride-2) + rate += get_block_bits(s, mb_x + 1, mb_y + 1, 1); } return distortion + rate*penalty_factor; } @@ -3389,7 +3391,12 @@ static void iterative_me(SnowContext *s){ color[i]= get_dc(s, mb_x, mb_y, i); // get previous score (cant be cached due to OBMC) - check_block_inter(s, mb_x, mb_y, block->mx, block->my, 0, *obmc_edged, &best_rd); + if(pass > 0 && (block->type&BLOCK_INTRA)){ + int color0[3]= {block->color[0], block->color[1], block->color[2]}; + check_block(s, mb_x, mb_y, color0, 1, *obmc_edged, &best_rd); + }else + check_block_inter(s, mb_x, mb_y, block->mx, block->my, 0, *obmc_edged, &best_rd); + check_block_inter(s, mb_x, mb_y, 0, 0, 0, *obmc_edged, &best_rd); check_block_inter(s, mb_x, mb_y, tb->mx, tb->my, 0, *obmc_edged, &best_rd); check_block_inter(s, mb_x, mb_y, lb->mx, lb->my, 0, *obmc_edged, &best_rd); |