[SCM] libav/experimental: Replace h->left_type[0] by the local variable for it we have. No meassureable speed effect.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:00 UTC 2013


The following commit has been merged in the experimental branch:
commit 4e992796a97f3e2b8943aebb32ce5b7691494e6a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jan 30 14:33:25 2010 +0000

    Replace h->left_type[0] by the local variable for it we have.
    No meassureable speed effect.
    
    Originally committed as revision 21541 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index f3bcad7..2c27929 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -375,13 +375,13 @@ void ff_h264_filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y,
             bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
         } else {
             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;
-            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;
+            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;
             int step =  1+(mb_type>>24); //IS_8x8DCT(mb_type) ? 2 : 1;
             edges = 4 - 3*((mb_type>>3) & !(h->cbp & 15)); //(mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
             s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
                                               h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
         }
-        if( IS_INTRA(h->left_type[0]) )
+        if( IS_INTRA(left_type) )
             bSv[0][0] = 0x0004000400040004ULL;
         if( IS_INTRA(h->top_type) )
             bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list