diff --git a/libavcodec/bfin/hpel_pixels_bfin.S b/libavcodec/bfin/hpel_pixels_bfin.S index 9b927b0d9f..8bed5c0410 100644 --- a/libavcodec/bfin/hpel_pixels_bfin.S +++ b/libavcodec/bfin/hpel_pixels_bfin.S @@ -220,64 +220,6 @@ LE$16O: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5; rts; DEFUN_END(z_put_pixels16_xy2) -DEFUN(put_pixels16_xy2_nornd,mL1, - (uint8_t *block, const uint8_t *s0, - int line_size, int h)): - link 0; - [--sp] = (r7:4); - i3=r0; // dest - i0=r1; // src0--> pixels - i1=r1; // src1--> pixels + line_size - m3=r2; - r2+=-12; - m2=r2; - r2+=-4; - i1+=m3; /* src1 + line_size */ - m0=r2; /* line-size - 20 */ - p0=[fp+20]; // h - - B0=I0; - B1=I1; - B3=I3; - - DISALGNEXCPT || R0 = [I0++] || R2 =[I1++]; - - LSETUP(LS$16ET,LE$16ET) LC0=P0; -LS$16ET:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++]; - R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++] || R2 =[I1++]; - R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R1 = [I0++] || [I3++] = R4 ; - DISALGNEXCPT || R3 = [I1++] || [I3++] = R5; - R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0]|| R2 = [I1++M0]; - R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ; -LE$16ET:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5; - - M1 = 1; - I3=B3; - I1=B1; - I0=B0; - - I0 += M1; - I1 += M1; - - DISALGNEXCPT || R0 = [I0++] || R2 =[I1++]; - LSETUP(LS$16OT,LE$16OT) LC0=P0; -LS$16OT:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++]; - R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++] || R2 =[I1++]; - R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R1 = [I0++] || R6 =[I3++]; - R4 = R4 +|+ R6 || R7 = [I3--]; - R5 = R5 +|+ R7 || [I3++] = R4; - DISALGNEXCPT || R3 =[I1++] || [I3++] = R5; - R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0]|| R2 = [I1++M0]; - R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++]; - R4 = R4 +|+ R6 || R7 = [I3--]; - R5 = R5 +|+ R7 || [I3++] = R4; -LE$16OT:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5; - - (r7:4) = [sp++]; - unlink; - rts; -DEFUN_END(put_pixels16_xy2_nornd) - DEFUN(z_put_pixels8_xy2,mL1, (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h)): @@ -327,54 +269,3 @@ LE$8O: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5; unlink; rts; DEFUN_END(z_put_pixels8_xy2) - -DEFUN(put_pixels8_xy2_nornd,mL1, - (uint8_t *block, const uint8_t *s0, int line_size, int h)): - link 0; - [--sp] = (r7:4); - i3=r0; // dest - i0=r1; // src0--> pixels - i1=r1; // src1--> pixels + line_size - m3=r2; - r2+=-4; - m2=r2; - r2+=-4; - i1+=m3; /* src1 + line_size */ - m0=r2; /* line-size - 20 */ - p0=[fp+20]; // h - - - b0 = I0; - b1 = I1; - b3 = I3; - - LSETUP(LS$8ET,LE$8ET) LC0=P0; - DISALGNEXCPT || R0 = [I0++] || R2 =[I1++]; - -LS$8ET: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++]; - R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0] || R2 = [I1++M0]; - R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ; -LE$8ET: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5; - - M1 = 1; - I3 = b3; - I1 = b1; - I0 = b0; - - I0 += M1; - I1 += M1; - - LSETUP(LS$8OT,LE$8OT) LC0=P0; - DISALGNEXCPT || R0 = [I0++] || R2 = [I1++]; - -LS$8OT: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++]; - R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0] || R2 = [I1++M0]; - R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++]; - R4 = R4 +|+ R6 || R7 = [I3--]; - R5 = R5 +|+ R7 || [I3++] = R4; -LE$8OT: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5; - - (r7:4) = [sp++]; - unlink; - rts; -DEFUN_END(put_pixels8_xy2_nornd) diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c index 4fc66ed1b8..c75e6bc0e0 100644 --- a/libavcodec/bfin/hpeldsp_bfin.c +++ b/libavcodec/bfin/hpeldsp_bfin.c @@ -114,10 +114,8 @@ av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags) c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_nornd; c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd; c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd; -/* c->put_no_rnd_pixels_tab[1][3] = ff_bfin_put_pixels8_xy2_nornd; */ c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd; c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd; c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd; -/* c->put_no_rnd_pixels_tab[0][3] = ff_bfin_put_pixels16_xy2_nornd; */ } diff --git a/libavcodec/bfin/hpeldsp_bfin.h b/libavcodec/bfin/hpeldsp_bfin.h index 2de16f76df..e99f0b0f8e 100644 --- a/libavcodec/bfin/hpeldsp_bfin.h +++ b/libavcodec/bfin/hpeldsp_bfin.h @@ -35,9 +35,6 @@ void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; -void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; - void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;