Revision 4e992796 libavcodec/h264_loopfilter.c

View differences:

libavcodec/h264_loopfilter.c
375 375
            bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
376 376
        } else {
377 377
            int mask_edge1 = (3*(((5*mb_type)>>5)&1)) | (mb_type>>4); //(mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : (mb_type & MB_TYPE_16x8) ? 1 : 0;
378
            int mask_edge0 = 3*((mask_edge1>>1) & ((5*h->left_type[0])>>5)&1); // (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) && (h->left_type[0] & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : 0;
378
            int mask_edge0 = 3*((mask_edge1>>1) & ((5*left_type)>>5)&1); // (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) && (h->left_type[0] & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : 0;
379 379
            int step =  1+(mb_type>>24); //IS_8x8DCT(mb_type) ? 2 : 1;
380 380
            edges = 4 - 3*((mb_type>>3) & !(h->cbp & 15)); //(mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
381 381
            s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
382 382
                                              h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
383 383
        }
384
        if( IS_INTRA(h->left_type[0]) )
384
        if( IS_INTRA(left_type) )
385 385
            bSv[0][0] = 0x0004000400040004ULL;
386 386
        if( IS_INTRA(h->top_type) )
387 387
            bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;

Also available in: Unified diff