comparison intrax8dsp.c @ 5907:fbd10e6dfbe1 libavcodec

cosmetics: Fix spacial --> spatial typo in function names.

5906:595a2f31430e

                1   - mb_x==0 - first block in the row, interpolate area #1,#2,#3;
                2   - mb_y==0 - first row, interpolate area #3,#4,#5,#6;
        note:   1|2 - mb_x==mb_y==0 - first block, use 0x80 value for all areas;
                4   - mb_x>= (mb_width-1) last block in the row, interpolate area #5;
*/
static void x8_setup_spacial_compensation(uint8_t *src, uint8_t *dst, int linesize,
           int * range, int * psum,  int edges){
    uint8_t * ptr;
    int sum;
    int i;
    int min_pix,max_pix;

    161,  855,  206,  788,  266,  710,  340, 623,  411, 548,  455, 455,  548, 366,  576, 288,
    122,  972,  159,  914,  211,  842,  276, 758,  341, 682,  389, 584,  483, 483,  520, 390,
    110, 1172,  144, 1107,  193, 1028,  254, 932,  317, 846,  366, 731,  458, 611,  499, 499
};

static void spacial_compensation_0(uint8_t *src , uint8_t *dst, int linesize){
    int i,j;
    int x,y;
    unsigned int p;//power divided by 2
    int a;
    uint16_t left_sum[2][8];

                      )>>16;
        }
        dst+=linesize;
    }
}
static void spacial_compensation_1(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 + FFMIN(2*y+x+2, 15) ];
        }
        dst+=linesize;
    }
}
static void spacial_compensation_2(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 +1+y+x];
        }
        dst+=linesize;
    }
}
static void spacial_compensation_3(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 +((y+1)>>1)+x];
        }
        dst+=linesize;
    }
}
static void spacial_compensation_4(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=( src[area4+x] + src[area6+x] + 1 )>>1;
        }
        dst+=linesize;
    }
}
static void spacial_compensation_5(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            if(2*x-y<0){

            }
        }
        dst+=linesize;
    }
}
static void spacial_compensation_6(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area3+x-y];
        }
        dst+=linesize;
    }
}
static void spacial_compensation_7(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            if(x-2*y>0){

            }
        }
        dst+=linesize;
    }
}
static void spacial_compensation_8(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=( src[area1+7-y] + src[area2+7-y] + 1 )>>1;
        }
        dst+=linesize;
    }
}
static void spacial_compensation_9(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area2+6-FFMIN(x+y,6)];
        }
        dst+=linesize;
    }
}
static void spacial_compensation_10(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=(src[area2+7-y]*(8-x)+src[area4+x]*x+4)>>3;
        }
        dst+=linesize;
    }
}
static void spacial_compensation_11(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=(src[area2+7-y]*y+src[area4+x]*(8-y)+4)>>3;

}

void ff_intrax8dsp_init(DSPContext* dsp, AVCodecContext *avctx) {
    dsp->x8_h_loop_filter=x8_h_loop_filter;
    dsp->x8_v_loop_filter=x8_v_loop_filter;
    dsp->x8_setup_spacial_compensation=x8_setup_spacial_compensation;
    dsp->x8_spacial_compensation[0]=spacial_compensation_0;
    dsp->x8_spacial_compensation[1]=spacial_compensation_1;
    dsp->x8_spacial_compensation[2]=spacial_compensation_2;
    dsp->x8_spacial_compensation[3]=spacial_compensation_3;
    dsp->x8_spacial_compensation[4]=spacial_compensation_4;
    dsp->x8_spacial_compensation[5]=spacial_compensation_5;
    dsp->x8_spacial_compensation[6]=spacial_compensation_6;
    dsp->x8_spacial_compensation[7]=spacial_compensation_7;
    dsp->x8_spacial_compensation[8]=spacial_compensation_8;
    dsp->x8_spacial_compensation[9]=spacial_compensation_9;
    dsp->x8_spacial_compensation[10]=spacial_compensation_10;
    dsp->x8_spacial_compensation[11]=spacial_compensation_11;
}

5907:fbd10e6dfbe1

                1   - mb_x==0 - first block in the row, interpolate area #1,#2,#3;
                2   - mb_y==0 - first row, interpolate area #3,#4,#5,#6;
        note:   1|2 - mb_x==mb_y==0 - first block, use 0x80 value for all areas;
                4   - mb_x>= (mb_width-1) last block in the row, interpolate area #5;
*/
static void x8_setup_spatial_compensation(uint8_t *src, uint8_t *dst, int linesize,
           int * range, int * psum,  int edges){
    uint8_t * ptr;
    int sum;
    int i;
    int min_pix,max_pix;

    161,  855,  206,  788,  266,  710,  340, 623,  411, 548,  455, 455,  548, 366,  576, 288,
    122,  972,  159,  914,  211,  842,  276, 758,  341, 682,  389, 584,  483, 483,  520, 390,
    110, 1172,  144, 1107,  193, 1028,  254, 932,  317, 846,  366, 731,  458, 611,  499, 499
};

static void spatial_compensation_0(uint8_t *src , uint8_t *dst, int linesize){
    int i,j;
    int x,y;
    unsigned int p;//power divided by 2
    int a;
    uint16_t left_sum[2][8];

                      )>>16;
        }
        dst+=linesize;
    }
}
static void spatial_compensation_1(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 + FFMIN(2*y+x+2, 15) ];
        }
        dst+=linesize;
    }
}
static void spatial_compensation_2(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 +1+y+x];
        }
        dst+=linesize;
    }
}
static void spatial_compensation_3(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area4 +((y+1)>>1)+x];
        }
        dst+=linesize;
    }
}
static void spatial_compensation_4(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=( src[area4+x] + src[area6+x] + 1 )>>1;
        }
        dst+=linesize;
    }
}
static void spatial_compensation_5(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            if(2*x-y<0){

            }
        }
        dst+=linesize;
    }
}
static void spatial_compensation_6(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area3+x-y];
        }
        dst+=linesize;
    }
}
static void spatial_compensation_7(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            if(x-2*y>0){

            }
        }
        dst+=linesize;
    }
}
static void spatial_compensation_8(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=( src[area1+7-y] + src[area2+7-y] + 1 )>>1;
        }
        dst+=linesize;
    }
}
static void spatial_compensation_9(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=src[area2+6-FFMIN(x+y,6)];
        }
        dst+=linesize;
    }
}
static void spatial_compensation_10(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=(src[area2+7-y]*(8-x)+src[area4+x]*x+4)>>3;
        }
        dst+=linesize;
    }
}
static void spatial_compensation_11(uint8_t *src , uint8_t *dst, int linesize){
    int x,y;

    for(y=0;y<8;y++){
        for(x=0;x<8;x++){
            dst[x]=(src[area2+7-y]*y+src[area4+x]*(8-y)+4)>>3;

}

void ff_intrax8dsp_init(DSPContext* dsp, AVCodecContext *avctx) {
    dsp->x8_h_loop_filter=x8_h_loop_filter;
    dsp->x8_v_loop_filter=x8_v_loop_filter;
    dsp->x8_setup_spatial_compensation=x8_setup_spatial_compensation;
    dsp->x8_spatial_compensation[0]=spatial_compensation_0;
    dsp->x8_spatial_compensation[1]=spatial_compensation_1;
    dsp->x8_spatial_compensation[2]=spatial_compensation_2;
    dsp->x8_spatial_compensation[3]=spatial_compensation_3;
    dsp->x8_spatial_compensation[4]=spatial_compensation_4;
    dsp->x8_spatial_compensation[5]=spatial_compensation_5;
    dsp->x8_spatial_compensation[6]=spatial_compensation_6;
    dsp->x8_spatial_compensation[7]=spatial_compensation_7;
    dsp->x8_spatial_compensation[8]=spatial_compensation_8;
    dsp->x8_spatial_compensation[9]=spatial_compensation_9;
    dsp->x8_spatial_compensation[10]=spatial_compensation_10;
    dsp->x8_spatial_compensation[11]=spatial_compensation_11;
}