diff options
| author | Multiple Authors <multiple_authors@ffmpeg_mt> | 2011-05-10 23:12:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-11 00:57:59 +0200 |
| commit | a811ec7cb5d6b31ddeef59bfaab074074f2e1a92 (patch) | |
| tree | 946d991cf0975658a4fb75bde9f93bbe82a93b76 /libavcodec/error_resilience.c | |
| parent | b5e089924f2b74b1b2140ba24f4ee8e0e17c7567 (diff) | |
| download | ffmpeg-a811ec7cb5d6b31ddeef59bfaab074074f2e1a92.tar.gz | |
Merging branch 'ffmpeg-mt/master'
Just some cosmetics & comments, the only functional change
"error_resilience: use s->last_picture for accessing last MVs."
Is so buggy that it needs a full rewrite, guess -1.0 PSNR loss wasnt
enough for ronald to realize there was a problem.
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 7904514c4b..0320ed01d0 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -663,6 +663,7 @@ static int is_intra_more_likely(MpegEncContext *s){ uint8_t *last_mb_ptr= s->last_picture.data [0] + mb_x*16 + mb_y*16*s->linesize; is_intra_likely += s->dsp.sad[0](NULL, last_mb_ptr, mb_ptr , s->linesize, 16); + // FIXME need await_progress() here is_intra_likely -= s->dsp.sad[0](NULL, last_mb_ptr, last_mb_ptr+s->linesize*16, s->linesize, 16); }else{ if(IS_INTRA(s->current_picture.mb_type[mb_xy])) @@ -1000,6 +1001,7 @@ void ff_er_frame_end(MpegEncContext *s){ int time_pp= s->pp_time; int time_pb= s->pb_time; + // FIXME await_progress here s->mv[0][0][0] = s->next_picture.motion_val[0][xy][0]*time_pb/time_pp; s->mv[0][0][1] = s->next_picture.motion_val[0][xy][1]*time_pb/time_pp; s->mv[1][0][0] = s->next_picture.motion_val[0][xy][0]*(time_pb - time_pp)/time_pp; |