comparison vp6.c @ 3697:596e62da8f29 libavcodec

rename vector to vect to avoid clash with Apple gcc

3696:e2aafe2aa2df

        for (ctx=0; ctx<3; ctx++)
            for (node=0; node<5; node++)
                s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255);
}

static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector)
{
    vp56_range_coder_t *c = &s->c;
    int comp;

    *vector = (vp56_mv_t) {0,0};
    if (s->vector_candidate_pos < 2)
        *vector = s->vector_candidate[0];

    for (comp=0; comp<2; comp++) {
        int i, delta = 0;

        if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) {

        if (delta && vp56_rac_get_prob(c, s->vector_model_sig[comp]))
            delta = -delta;

        if (!comp)
            vector->x += delta;
        else
            vector->y += delta;
    }
}

static void vp6_parse_coeff(vp56_context_t *s)
{

3697:596e62da8f29

        for (ctx=0; ctx<3; ctx++)
            for (node=0; node<5; node++)
                s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255);
}

static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
{
    vp56_range_coder_t *c = &s->c;
    int comp;

    *vect = (vp56_mv_t) {0,0};
    if (s->vector_candidate_pos < 2)
        *vect = s->vector_candidate[0];

    for (comp=0; comp<2; comp++) {
        int i, delta = 0;

        if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) {

        if (delta && vp56_rac_get_prob(c, s->vector_model_sig[comp]))
            delta = -delta;

        if (!comp)
            vect->x += delta;
        else
            vect->y += delta;
    }
}

static void vp6_parse_coeff(vp56_context_t *s)
{