diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 00:34:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-18 00:34:28 +0000 |
| commit | 7da0d82104866b6c10104ce5735d3beaf77d2889 (patch) | |
| tree | 11c09524b3418fda071c46351ebe9072f0080388 /libavcodec | |
| parent | 12be38ec18acc09c1701ed783d49bed261793a29 (diff) | |
| download | ffmpeg-7da0d82104866b6c10104ce5735d3beaf77d2889.tar.gz | |
Make qp check for loop filter skiping also work with MBAFF.
Originally committed as revision 21276 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 2bbd744398..94e386375c 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -798,15 +798,14 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb //for sufficiently low qp, filtering wouldn't do anything //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp - if(!FRAME_MBAFF){ int qp_thresh = h->qp_thresh; //FIXME strictly we should store qp_thresh for each mb of a slice int qp = s->current_picture.qscale_table[mb_xy]; if(qp <= qp_thresh - && (s->mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh) + && (left_xy[0]<0 || ((qp + s->current_picture.qscale_table[left_xy[0]] + 1)>>1) <= qp_thresh) + && (left_xy[1]<0 || ((qp + s->current_picture.qscale_table[left_xy[1]] + 1)>>1) <= qp_thresh) && (top_xy < 0 || ((qp + s->current_picture.qscale_table[top_xy ] + 1)>>1) <= qp_thresh)){ return 1; } - } *((uint64_t*)&h->non_zero_count_cache[0+8*1])= *((uint64_t*)&h->non_zero_count[mb_xy][ 0]); *((uint64_t*)&h->non_zero_count_cache[0+8*2])= *((uint64_t*)&h->non_zero_count[mb_xy][ 8]); |