comparison h264_loopfilter.c @ 10949:4c9b8e3065ee libavcodec

Simplify/Optimize another of the mbaff loop filter cases. Its faster but too rarely used to make a differnce.

10948:c80f0dfbf47d

        // frame macroblock.
        //
        unsigned int tmp_linesize   = 2 *   linesize;
        unsigned int tmp_uvlinesize = 2 * uvlinesize;
        int mbn_xy = mb_xy - 2 * s->mb_stride;
        int qp;
        int i, j;
        int16_t bS[4];

        for(j=0; j<2; j++, mbn_xy += s->mb_stride){
            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];
                for( i = 0; i < 4; i++ ) {
                    if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
                        mbn_nnz[i+4+3*8] != 0 )
                        bS[i] = 2;
                    else
                        bS[i] = 1;
                }
            }
            // 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;

10949:4c9b8e3065ee

        // frame macroblock.
        //
        unsigned int tmp_linesize   = 2 *   linesize;
        unsigned int tmp_uvlinesize = 2 * uvlinesize;
        int mbn_xy = mb_xy - 2 * s->mb_stride;
        int j;

        for(j=0; j<2; j++, mbn_xy += s->mb_stride){
            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;
                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;