Mercurial > libavcodec.hg

changeset 10918:f36f33e673b4 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reenable filter_mb_fast for I slices and progressive CABAC P slices.
author michael
date Mon, 18 Jan 2010 16:16:22 +0000
parents 895df334c326
children 241c0f3bba65
files h264_loopfilter.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264_loopfilter.c	Mon Jan 18 16:11:13 2010 +0000
+++ b/h264_loopfilter.c	Mon Jan 18 16:16:22 2010 +0000
@@ -334,8 +334,10 @@
     mb_xy = h->mb_xy;
 
     if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
-        !(s->flags2 & CODEC_FLAG2_FAST) || //FIXME filter_mb_fast is broken, thus hasto be, but should not under CODEC_FLAG2_FAST
-       (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] ||
+       !(h->slice_type_nos == FF_I_TYPE ||
+         (CABAC && h->slice_type_nos == FF_P_TYPE && !FIELD_PICTURE) ||
+         (s->flags2 & CODEC_FLAG2_FAST)) ||
+       (h->deblocking_filter == 2 && (h->slice_table[mb_xy] != h->slice_table[h->top_mb_xy] || //use slice_num
                                       h->slice_table[mb_xy] != h->slice_table[mb_xy - 1]))) {
         ff_h264_filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
         return;