comparison h264_loopfilter.c @ 11087:1b8e11679883 libavcodec

Fix CAVLC+8x8DCT+MBAFF loopfiltering. Fixes issue1250

11086:d4222f5b6dea

                DECLARE_ALIGNED_8(int16_t, bS)[4];
                int qp;
                if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) {
                    *(uint64_t*)bS= 0x0003000300030003ULL;
                } else {
                    const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy] + 4+3*8; //FIXME  8x8dct?
                    int i;
                    for( i = 0; i < 4; i++ ) {
                        bS[i] = 1 + !!(h->non_zero_count_cache[scan8[0]+i] | mbn_nnz[i]);
                    }
                }
                // Do not use s->qscale as luma quantizer because it has not the same
                // value in IPCM macroblocks.
                qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;

11087:1b8e11679883

                DECLARE_ALIGNED_8(int16_t, bS)[4];
                int qp;
                if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) {
                    *(uint64_t*)bS= 0x0003000300030003ULL;
                } else {
                    if(!CABAC && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])){
                        bS[0]= 1+((h->cbp_table[mbn_xy] & 4)||h->non_zero_count_cache[scan8[0]+0]);
                        bS[1]= 1+((h->cbp_table[mbn_xy] & 4)||h->non_zero_count_cache[scan8[0]+1]);
                        bS[2]= 1+((h->cbp_table[mbn_xy] & 8)||h->non_zero_count_cache[scan8[0]+2]);
                        bS[3]= 1+((h->cbp_table[mbn_xy] & 8)||h->non_zero_count_cache[scan8[0]+3]);
                    }else{
                    const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy] + 4+3*8;
                    int i;
                    for( i = 0; i < 4; i++ ) {
                        bS[i] = 1 + !!(h->non_zero_count_cache[scan8[0]+i] | mbn_nnz[i]);
                    }
                    }
                }
                // Do not use s->qscale as luma quantizer because it has not the same
                // value in IPCM macroblocks.
                qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;