Mercurial > libavcodec.hg

changeset 11015:d844c58b985a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use left_mb_xy from fill_caches instead of recalculating it.
author michael
date Tue, 26 Jan 2010 14:57:53 +0000
parents 51d8befcc773
children 4aee091df934
files h264_loopfilter.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/h264_loopfilter.c	Tue Jan 26 14:55:19 2010 +0000
+++ b/h264_loopfilter.c	Tue Jan 26 14:57:53 2010 +0000
@@ -622,8 +622,6 @@
         /* First vertical edge is different in MBAFF frames
          * There are 8 different bS to compute and 2 different Qp
          */
-        const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
-        const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride };
         DECLARE_ALIGNED_8(int16_t, bS)[8];
         int qp[2];
         int bqp[2];
@@ -637,7 +635,7 @@
             *(uint64_t*)&bS[4]= 0x0004000400040004ULL;
         else {
             for( i = 0; i < 8; i++ ) {
-                int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1];
+                int mbn_xy = MB_FIELD ? h->left_mb_xy[i>>2] : h->left_mb_xy[i&1];
 
                 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
                     bS[i] = 4;
@@ -653,8 +651,8 @@
         }
 
         mb_qp = s->current_picture.qscale_table[mb_xy];
-        mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
-        mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
+        mbn0_qp = s->current_picture.qscale_table[h->left_mb_xy[0]];
+        mbn1_qp = s->current_picture.qscale_table[h->left_mb_xy[1]];
         qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
         bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) +
                    get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1;