comparison ffv1.c @ 1605:2fb583cb0013 libavcodec

fix context=1 remove always_inline, gcc fails to inline other more important inline functions otherwise ...

1604:21190cfac0e1

    update_vlc_state(state, v);
//printf("final: %d\n", ret);
    return ret;
}

static always_inline void encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x;
    int run_index= s->run_index;
    int run_count=0;
    int run_mode=0;

    for(x=0; x<w; x++){
        int diff, context;
        
        context= get_context(s, sample[1]+x, sample[0]+x, sample[1]+x);
        diff= sample[1][x] - predict(sample[1]+x, sample[0]+x);

        if(context < 0){
            context = -context;
            diff= -diff;

    s->run_index= run_index;
}

static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    int x,y;
    int_fast16_t sample_buffer[2][w+6];
    int_fast16_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3};
    s->run_index=0;
    
    memset(sample_buffer, 0, sizeof(sample_buffer));
    
    for(y=0; y<h; y++){
        int_fast16_t *temp= sample[0]; //FIXME try a normal buffer

        sample[0]= sample[1];
        sample[1]= temp;
        
        sample[1][-1]= sample[0][0  ];
        sample[0][ w]= sample[0][w-1];
//{START_TIMER
        for(x=0; x<w; x++){

    common_end(s);

    return 0;
}

static always_inline void decode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x;
    int run_count=0;
    int run_mode=0;

1605:2fb583cb0013

    update_vlc_state(state, v);
//printf("final: %d\n", ret);
    return ret;
}

static inline void encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x;
    int run_index= s->run_index;
    int run_count=0;
    int run_mode=0;

    for(x=0; x<w; x++){
        int diff, context;
        
        context= get_context(s, sample[1]+x, sample[0]+x, sample[2]+x);
        diff= sample[1][x] - predict(sample[1]+x, sample[0]+x);

        if(context < 0){
            context = -context;
            diff= -diff;

    s->run_index= run_index;
}

static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
    int x,y;
    int_fast16_t sample_buffer[3][w+6];
    int_fast16_t *sample[3]= {sample_buffer[0]+3, sample_buffer[1]+3, sample_buffer[2]+3};
    s->run_index=0;
    
    memset(sample_buffer, 0, sizeof(sample_buffer));
    
    for(y=0; y<h; y++){
        int_fast16_t *temp= sample[0]; //FIXME try a normal buffer

        sample[0]= sample[1];
        sample[1]= sample[2];
        sample[2]= temp;
        
        sample[1][-1]= sample[0][0  ];
        sample[0][ w]= sample[0][w-1];
//{START_TIMER
        for(x=0; x<w; x++){

    common_end(s);

    return 0;
}

static inline void decode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
    PlaneContext * const p= &s->plane[plane_index];
    CABACContext * const c= &s->c;
    int x;
    int run_count=0;
    int run_mode=0;