[FFmpeg-devel] H264: Fix non_zero_count_cache for deblocking in fields

[Michael Niedermayer]

On Wed, Dec 12, 2007 at 04:29:32PM -0500, Jeff Downs wrote:
> On Wed, 12 Dec 2007, Michael Niedermayer wrote:
> 
> > On Fri, Nov 30, 2007 at 10:58:23AM +0100, Martin Zlomek wrote:
> 
> [...]
> 
> > > Index: libavcodec/h264.c
> > > ===================================================================
> > > --- libavcodec/h264.c	(revision 11112)
> > > +++ libavcodec/h264.c	(working copy)
> > > @@ -172,7 +172,7 @@
> > >      int i;
> > >  
> > >      //FIXME deblocking could skip the intra and nnz parts.
> > > -    if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy-s->mb_stride]) && !FRAME_MBAFF)
> > > +    if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy - (s->mb_stride << FIELD_PICTURE)]) && !FRAME_MBAFF)
> > >          return;
> > >  
> > >      //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it
> > 
> > patch ok
> 
> Was about to apply, but noticed mb_xy - (mb_stride << FIELD_PICTURE) was 
> already being computed just below.
> Attached a bit cleaner end result?

ok as well

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I hate to see young programmers poisoned by the kind of thinking
Ulrich Drepper puts forward since it is simply too narrow -- Roman Shaposhnik
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20071212/6a2720aa/attachment.pgp>