comparison vc1.c @ 3450:906c58dcb6ea libavcodec

Use overlap filter instead of loop filter.

3449:ec6096b1ab04

            dst++;
        }
    }
}

/** Apply overlap transform
 * @todo optimize
 * @todo move to DSPContext
 */
static void vc1_overlap_block(MpegEncContext *s, DCTELEM block[64], int n, int do_hor, int do_vert)
{
    int i;

    if(do_hor) { //TODO
    }
    if(do_vert) { //TODO
    }

    for(i = 0; i < 64; i++)
        block[i] += 128;
}


static void vc1_v_overlap(uint8_t* src, int stride)
{
    int i;
    int a, b, c, d;
    for(i = 0; i < 8; i++) {

        src[stride] = clip_uint8((a + 7*d + 3) >> 3);
        src++;
    }
}

static void vc1_h_overlap(uint8_t* src, int stride)
{
    int i;
    int a, b, c, d;
    for(i = 0; i < 8; i++) {

                    for(j = 0; j < 64; j++) block[i][j] += 128;
                    s->dsp.put_pixels_clamped(block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                    /* TODO: proper loop filtering */
                    if(v->pq >= 9 && v->overlap) {
                        if(v->a_avail)
                            s->dsp.h263_v_loop_filter(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2), s->y_dc_scale);
                        if(v->c_avail)
                            s->dsp.h263_h_loop_filter(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2), s->y_dc_scale);
                    }
                } else if(val) {
                    vc1_decode_p_block(v, block[i], i, mquant, ttmb, first_block);
                    if(!v->ttmbf && ttmb < 8) ttmb = -1;
                    first_block = 0;

                    for(j = 0; j < 64; j++) block[i][j] += 128;
                    s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
                    /* TODO: proper loop filtering */
                    if(v->pq >= 9 && v->overlap) {
                        if(v->a_avail)
                            s->dsp.h263_v_loop_filter(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2), s->y_dc_scale);
                        if(v->c_avail)
                            s->dsp.h263_h_loop_filter(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2), s->y_dc_scale);
                    }
                } else if(is_coded[i]) {
                    status = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block);
                    if(!v->ttmbf && ttmb < 8) ttmb = -1;
                    first_block = 0;

/** Decode blocks of I-frame
 */
static void vc1_decode_i_blocks(VC1Context *v)
{
    int k;
    MpegEncContext *s = &v->s;
    int cbp, val;
    uint8_t *coded_val;
    int mb_pos;

                vc1_decode_i_block(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2);

                vc1_inv_trans(s->block[k], 8, 8);
                if(v->pq >= 9 && v->overlap) {
                    vc1_overlap_block(s, s->block[k], k, (s->mb_y || k>1), (s->mb_x || (k != 0 && k != 2)));
                }
            }

            vc1_put_block(v, s->block);
            if(v->pq >= 9 && v->overlap) { /* XXX: do proper overlapping insted of loop filter */
                if(s->mb_y) {
                    s->dsp.h263_v_loop_filter(s->dest[0], s->linesize, s->y_dc_scale);
                    s->dsp.h263_v_loop_filter(s->dest[0] + 8, s->linesize, s->y_dc_scale);
                    s->dsp.h263_v_loop_filter(s->dest[1], s->uvlinesize, s->y_dc_scale);
                    s->dsp.h263_v_loop_filter(s->dest[2], s->uvlinesize, s->y_dc_scale);
                }
                s->dsp.h263_v_loop_filter(s->dest[0] + 8 * s->linesize, s->linesize, s->y_dc_scale);
                s->dsp.h263_v_loop_filter(s->dest[0] + 8 * s->linesize + 8, s->linesize, s->y_dc_scale);
                if(s->mb_x) {
                    s->dsp.h263_h_loop_filter(s->dest[0], s->linesize, s->y_dc_scale);
                    s->dsp.h263_h_loop_filter(s->dest[0] + 8 * s->linesize, s->linesize, s->y_dc_scale);
                    s->dsp.h263_h_loop_filter(s->dest[1], s->uvlinesize, s->y_dc_scale);
                    s->dsp.h263_h_loop_filter(s->dest[2], s->uvlinesize, s->y_dc_scale);
                }
                s->dsp.h263_h_loop_filter(s->dest[0] + 8, s->linesize, s->y_dc_scale);
                s->dsp.h263_h_loop_filter(s->dest[0] + 8 * s->linesize + 8, s->linesize, s->y_dc_scale);
            }

            if(get_bits_count(&s->gb) > v->bits) {
                av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
                return;

3450:906c58dcb6ea

            dst++;
        }
    }
}

/** Apply overlap transform to vertical edge
 * @todo optimize
 * @todo move to DSPContext
 */
static void vc1_v_overlap(uint8_t* src, int stride)
{
    int i;
    int a, b, c, d;
    for(i = 0; i < 8; i++) {

        src[stride] = clip_uint8((a + 7*d + 3) >> 3);
        src++;
    }
}

/** Apply overlap transform to horizontal edge
 * @todo optimize
 * @todo move to DSPContext
 */
static void vc1_h_overlap(uint8_t* src, int stride)
{
    int i;
    int a, b, c, d;
    for(i = 0; i < 8; i++) {

                    for(j = 0; j < 64; j++) block[i][j] += 128;
                    s->dsp.put_pixels_clamped(block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                    /* TODO: proper loop filtering */
                    if(v->pq >= 9 && v->overlap) {
                        if(v->a_avail)
                            vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                        if(v->c_avail)
                            vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                    }
                } else if(val) {
                    vc1_decode_p_block(v, block[i], i, mquant, ttmb, first_block);
                    if(!v->ttmbf && ttmb < 8) ttmb = -1;
                    first_block = 0;

                    for(j = 0; j < 64; j++) block[i][j] += 128;
                    s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
                    /* TODO: proper loop filtering */
                    if(v->pq >= 9 && v->overlap) {
                        if(v->a_avail)
                            vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                        if(v->c_avail)
                            vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
                    }
                } else if(is_coded[i]) {
                    status = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block);
                    if(!v->ttmbf && ttmb < 8) ttmb = -1;
                    first_block = 0;

/** Decode blocks of I-frame
 */
static void vc1_decode_i_blocks(VC1Context *v)
{
    int k, j;
    MpegEncContext *s = &v->s;
    int cbp, val;
    uint8_t *coded_val;
    int mb_pos;

                vc1_decode_i_block(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2);

                vc1_inv_trans(s->block[k], 8, 8);
                if(v->pq >= 9 && v->overlap) {
                    for(j = 0; j < 64; j++) s->block[k][j] += 128;
                }
            }

            vc1_put_block(v, s->block);
            if(v->pq >= 9 && v->overlap) { /* XXX: do proper overlapping insted of loop filter */
                if(!s->first_slice_line) {
                    vc1_v_overlap(s->dest[0], s->linesize);
                    vc1_v_overlap(s->dest[0] + 8, s->linesize);
                    vc1_v_overlap(s->dest[1], s->uvlinesize);
                    vc1_v_overlap(s->dest[2], s->uvlinesize);
                }
                vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
                vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
                if(s->mb_x) {
                    vc1_h_overlap(s->dest[0], s->linesize);
                    vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
                    vc1_h_overlap(s->dest[1], s->uvlinesize);
                    vc1_h_overlap(s->dest[2], s->uvlinesize);
                }
                vc1_h_overlap(s->dest[0] + 8, s->linesize);
                vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
            }

            if(get_bits_count(&s->gb) > v->bits) {
                av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
                return;