Revision 77821e11

View differences:

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

Also available in: Unified diff