diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-25 00:41:49 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-25 00:41:49 +0000 |
| commit | cf8bb33428b89f7f58457ad4c2d6954836552ebe (patch) | |
| tree | a54b9d4c427b35fd431e1cc426defb0a5f7fdca6 /libavcodec/h264.c | |
| parent | fe2817830379aaad6212d49ff475f81ff4abcf07 (diff) | |
Fix CAVLC+8x8+MBAFF loop filter.
Fixes FREXT02_JVC_C.
Originally committed as revision 15410 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 64f10f95fe..4a6c86e8ac 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6383,8 +6383,10 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) bS[i] = 4; else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || - /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ - h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) + ((!h->pps.cabac && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])) ? + (h->cbp_table[mbn_xy] & ((MB_FIELD ? (i&2) : (mb_y&1)) ? 8 : 2)) + : + h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2])) bS[i] = 2; else bS[i] = 1; |