comparison h263.c @ 3255:183e3eb0824a libavcodec

100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)

3254:9ff165550d75

    }
}

#endif //CONFIG_ENCODERS

static void ff_mpeg4_init_direct_mv(MpegEncContext *s){
    //FIXME table is stored in MpegEncContext for thread-safety,
    // but a static array would be faster
    static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t);
    static const int tab_bias = (tab_size/2);
    int i;
    for(i=0; i<tab_size; i++){
        s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
        s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
    }
}

static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
    static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t);
    static const int tab_bias = (tab_size/2);
    int xy= s->block_index[i];
    uint16_t time_pp= s->pp_time;
    uint16_t time_pb= s->pb_time;
    int p_mx, p_my;

        s->mv[0][i][1] = p_my*time_pb/time_pp + my;
        s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
                            : p_my*(time_pb - time_pp)/time_pp;
    }
}

/**
 *
 * @return the mb_type
 */

3255:183e3eb0824a

    }
}

#endif //CONFIG_ENCODERS

#define tab_size (sizeof(s->direct_scale_mv[0])/sizeof(int16_t))
#define tab_bias (tab_size/2)

static void ff_mpeg4_init_direct_mv(MpegEncContext *s){
    int i;
    for(i=0; i<tab_size; i++){
        s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
        s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
    }
}

static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
    int xy= s->block_index[i];
    uint16_t time_pp= s->pp_time;
    uint16_t time_pb= s->pb_time;
    int p_mx, p_my;

        s->mv[0][i][1] = p_my*time_pb/time_pp + my;
        s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
                            : p_my*(time_pb - time_pp)/time_pp;
    }
}

#undef tab_size
#undef tab_bias

/**
 *
 * @return the mb_type
 */