From: "Ronald S. Bultje" <[email protected]>
---
libavcodec/bfin/Makefile | 2 +
libavcodec/bfin/dsputil_bfin.c | 95 ------
libavcodec/bfin/dsputil_bfin.h | 11 -
.../bfin/{pixels_bfin.S => hpel_pixels_bfin.S} | 361 --------------------
libavcodec/bfin/hpeldsp_bfin.c | 119 +++++++
libavcodec/bfin/hpeldsp_bfin.h | 50 +++
libavcodec/bfin/pixels_bfin.S | 359 -------------------
libavcodec/hpeldsp.c | 1 +
libavcodec/hpeldsp.h | 1 +
9 files changed, 173 insertions(+), 826 deletions(-)
copy libavcodec/bfin/{pixels_bfin.S => hpel_pixels_bfin.S} (54%)
create mode 100644 libavcodec/bfin/hpeldsp_bfin.c
create mode 100644 libavcodec/bfin/hpeldsp_bfin.h
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index d1b41bc..c293360 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -3,6 +3,8 @@ OBJS += bfin/dsputil_bfin.o
\
bfin/idct_bfin.o \
bfin/pixels_bfin.o \
+OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_bfin.o \
+ bfin/hpel_pixels_bfin.o
OBJS-$(CONFIG_MPEGVIDEOENC) += bfin/mpegvideo_bfin.o
OBJS-$(CONFIG_VP3DSP) += bfin/vp3_bfin.o \
bfin/vp3_idct_bfin.o
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c
index b6737a2..63042c5 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@@ -54,79 +54,6 @@ static void bfin_clear_blocks (int16_t *blocks)
::"a" (blocks):"P0","I0","R0");
}
-
-
-static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, ptrdiff_t
line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size,
line_size, h);
-}
-
-static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t
line_size, int h)
-{
- ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
-}
-
-static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
-}
-
-static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
-}
-
-static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size,
line_size, h);
-}
-
-static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0,
ptrdiff_t line_size, int h)
-{
- ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
-}
-
-static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
-}
-
-static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size,
h);
-}
-
-
-static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
-}
-
-static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
-}
-
-static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size,
h);
-}
-
static int bfin_pix_abs16 (void *c, uint8_t *blk1, uint8_t *blk2, int
line_size, int h)
{
return ff_bfin_z_sad16x16 (blk1,blk2,line_size,line_size,h);
@@ -232,28 +159,6 @@ av_cold void ff_dsputil_init_bfin(DSPContext *c,
AVCodecContext *avctx)
c->sse[1] = ff_bfin_sse8;
c->sse[2] = ff_bfin_sse4;
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = bfin_put_pixels16;
- c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
- c->put_pixels_tab[0][2] = bfin_put_pixels16_y2;
- c->put_pixels_tab[0][3] = bfin_put_pixels16_xy2;
-
- c->put_pixels_tab[1][0] = bfin_put_pixels8;
- c->put_pixels_tab[1][1] = bfin_put_pixels8_x2;
- c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
- c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
-
- 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; */
- }
-
if (avctx->bits_per_raw_sample <= 8) {
if (avctx->dct_algo == FF_DCT_AUTO)
c->fdct = ff_bfin_fdct;
diff --git a/libavcodec/bfin/dsputil_bfin.h b/libavcodec/bfin/dsputil_bfin.h
index 238c73c..a082cd7 100644
--- a/libavcodec/bfin/dsputil_bfin.h
+++ b/libavcodec/bfin/dsputil_bfin.h
@@ -46,19 +46,8 @@ int ff_bfin_pix_norm1 (uint8_t * pix, int line_size)
attribute_l1_text;
int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size,
int h) attribute_l1_text;
int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size,
int h) attribute_l1_text;
-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;
-
-
int ff_bfin_pix_sum (uint8_t *p, int stride) 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;
-void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const
uint8_t *s1, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const
uint8_t *s1, int line_size, int h) attribute_l1_text;
-
int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int
h) attribute_l1_text;
int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int
h) attribute_l1_text;
int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int
h) attribute_l1_text;
diff --git a/libavcodec/bfin/pixels_bfin.S b/libavcodec/bfin/hpel_pixels_bfin.S
similarity index 54%
copy from libavcodec/bfin/pixels_bfin.S
copy to libavcodec/bfin/hpel_pixels_bfin.S
index 99d4495..d876d22 100644
--- a/libavcodec/bfin/pixels_bfin.S
+++ b/libavcodec/bfin/hpel_pixels_bfin.S
@@ -20,70 +20,6 @@
*/
#include "config_bfin.h"
-DEFUN(put_pixels_clamped,mL1,
- (int16_t *block, uint8_t *dest, int line_size)):
- [--SP] = (R7:4);
- R4 = 0;
- R5.l = 0x00ff;
- R5.h = 0x00ff;
- I0 = R0; // block
- I1 = R1; // dest
- R2 += -4; // line_size
- M1 = R2;
- P0 = 8;
- R0 = [I0++];
- R1 = [I0++];
- R2 = MAX(R0, R4) (V);
- LSETUP (ppc$0,ppc$1) LC0=P0;
-ppc$0: R2 = MIN(R2, R5) (V);
- R3 = MAX(R1, R4) (V);
- R3 = MIN(R3, R5) (V) || R0 = [I0++];
- R6 = BYTEPACK (R2,R3) || R1 = [I0++];
- R2 = MAX(R0, R4) (V) || [I1++] = R6;
- R2 = MIN(R2, R5) (V);
- R3 = MAX(R1, R4) (V);
- R3 = MIN(R3, R5) (V) || R0 = [I0++];
- R6 = BYTEPACK (R2,R3) || R1 = [I0++];
-ppc$1: R2 = Max(R0, R4) (V) || [I1++M1] = R6;
-
- (R7:4) = [SP++];
- RTS;
-DEFUN_END(put_pixels_clamped)
-
-DEFUN(add_pixels_clamped,mL1,
- (int16_t *block, uint8_t *dest, int line_size)):
- [-- SP] = (R7:4);
- R4 = 0;
- I0 = 0;
- R2 += -4; // line_size
- M0 = R2;
- I1 = R1; // dest
- I3 = R0; // block
- I2 = R1; // dest
- P0 = 8;
- M3 = 2;
- R0 = [I3++] || R2 = [I1];
- R2 = R2 << 8 || R0.H = W[I3--] || R3 = [I1++];
- R3 = R3 >> 8 || R1.L = W[I3] || I3 += 4;
- R6 = BYTEOP3P(R1:0, R3:2) (LO) || R1.H = W[I3++] || R2 = [I1];
-
- LSETUP(apc$2,apc$3) LC1 = P0;
-apc$2: R7 = BYTEOP3P(R1:0, R3:2) (HI, R) || R0 = [I3++] || R3 = [I1++M0];
- R2 = R2 << 8 || R0.H = W[I3--];
- R3 = R3 >> 8 || R1.L = W[I3] || I3 += 4;
- R6 = R6 + R7 (S) || R1.H = W[I3];
- R6 = BYTEOP3P(R1:0, R3:2) (LO) || I3+=M3 || [I2++]=R6;
- R7 = BYTEOP3P(R1:0, R3:2) (HI, R) || R0 = [I3++] || R2 = [I1];
- R2 = R2 << 8 || R0.H = W[I3--] || R3 = [I1++];
- R3 = R3 >> 8 || R1.L = W[I3] || I3 += 4;
- R6 = R6 + R7 (S) || R1.H = W[I3++];
-apc$3: R6 = BYTEOP3P(R1:0, R3:2) (LO) || [I2++M0] = R6 || R2 = [I1];
-
- (R7:4) = [SP++];
- RTS;
-DEFUN_END(add_pixels_clamped)
-
-
/*
motion compensation
primitives
@@ -441,300 +377,3 @@ LE$8OT: DISALGNEXCPT || R2 =[I1++]
|| [I3++M2] = R5;
unlink;
rts;
DEFUN_END(put_pixels8_xy2_nornd)
-
-DEFUN(diff_pixels,mL1,
- (int16_t *block, uint8_t *s1, uint8_t *s2, int stride)):
- link 0;
- [--sp] = (r7:4);
- p0=8;
- i3=r0; // block
- i0=r1; // s1
- i1=r2; // s2
- r2=[fp+20]; // stride
- r2+=-8;
- m0=r2;
-
-
- LSETUP(.LS0,.LE0) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-.LS0: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- (R5,R4) = BYTEOP16M (R1:0,R3:2) || R0 = [I0++M0] || R2 = [I1++M0];
- (R7,R6) = BYTEOP16M (R1:0,R3:2) (R)|| R0 = [I0++] || [I3++] = R4;
- DISALGNEXCPT || R2 = [I1++] || [I3++] = R5;
- [i3++]=r6;
-.LE0: [i3++]=r7;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-DEFUN_END(diff_pixels)
-
-/*
- for (i = 0; i < 16; i++) {
- for (j = 0; j < 16; j++) {
- sum += pix[j];
- }
- pix += line_size;
- }
-*/
-DEFUN(pix_sum,mL1,
- (uint8_t *p, int stride)):
- link 0;
- [--sp] = (r7:4);
- p0=8;
- i0=r0; // s1
- i1=r0;
- m1=r1;
- r1=r1+r1;
- r1+=-16; // stride
- m0=r1;
- i1+=m1;
-
- r6=0;
-
- LSETUP(LS$PS,LE$PS) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-LS$PS: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- (R5,R4) = BYTEOP16P (R3:2,R1:0) || R0 = [I0++] || R2 = [I1++];
- r6=r6+|+r5;
- r6=r6+|+r4;
- (R5,R4) = BYTEOP16P (R3:2,R1:0) (R)|| R1 = [I0++] || R3 = [I1++];
- r6=r6+|+r5;
- r6=r6+|+r4;
- (R5,R4) = BYTEOP16P (R3:2,R1:0) || R0 = [I0++m0] || R2 = [I1++m0];
- r6=r6+|+r5;
- r6=r6+|+r4;
- (R5,R4) = BYTEOP16P (R3:2,R1:0) (R)|| R0 = [I0++] || R2 = [I1++];
- r6=r6+|+r5;
-LE$PS: r6=r6+|+r4;
- r0.l=r6.l+r6.h;
- r0.h=0;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-DEFUN_END(pix_sum)
-
-
-DEFUN(get_pixels,mL1,
- (int16_t *restrict block, const uint8_t *pixels, int line_size)):
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0
- p0=8;
- r2+=-8;
- m0=r2;
- LSETUP(gp8$0,gp8$1) LC0=P0;
-
- DISALGNEXCPT || R0 = [I0++];
- DISALGNEXCPT || R1 = [I0++];
-
-gp8$0: (R7,R6) = byteunpack R1:0 || R0 = [I0++M0];
- (R5,R4) = byteunpack R1:0 (R) || R0 = [I0++] || [I3++]=R6;
- DISALGNEXCPT || R1 = [I0++] || [I3++]=R7;
- [I3++]=R4;
-gp8$1: [I3++]=R5
-
-
- (r7:4) = [sp++];
- RTS;
-DEFUN_END(get_pixels)
-
-
-/* sad = sad16x16 (ubyte *mb, ubyte *refwin, srcwidth, refwinwidth, h) */
-/* 91 cycles */
-DEFUN(z_sad16x16,mL1,
- (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h)):
- link 0;
- I0 = R0;
- I1 = R1;
-
- A1 = A0 = 0;
- R0 = [sp+20]; // rwidth
- P2 = [sp+24]; // height
- R3 = 16;
- R0 = R0 - R3;
- R3 = R2 - R3;
- M1 = R0;
- M0 = R3;
-
- DISALGNEXCPT || R0 = [I0++] || R2 = [I1++];
- LSETUP (s$16, e$16) LC0=P2;
-s$16: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- SAA (R1:0,R3:2) || R0 = [I0++] || R2 = [I1++];
- SAA (R1:0,R3:2) (R) || R1 = [I0++] || R3 = [I1++];
- SAA (R1:0,R3:2) || R0 = [I0++M0] || R2 = [I1++M1];
-e$16: SAA (R1:0,R3:2) (R) || R0 = [I0++] || R2 = [I1++];
-
- R3=A1.L+A1.H, R2=A0.L+A0.H ;
- R0 = R2 + R3 ;
- unlink;
- RTS;
-DEFUN_END(z_sad16x16)
-
-/* sad = sad8x8 (ubyte *mb, ubyte *refwin, int srcwidth, int refwinwidth, int
h) */
-/* 36 cycles */
-DEFUN(z_sad8x8,mL1,
- (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h)):
- I0 = R0;
- I1 = R1;
-
- A1 = A0 = 0;
- r0 = [sp+12]; // rwidth
- P2 = [sp+16]; //height
- R3 = 8;
- R0 = R0 - R3;
- R3 = R2 - R3;
- M0 = R3;
- M1 = R0;
-
- LSETUP (s$8, e$8) LC0=P2;
- DISALGNEXCPT || R0 = [I0++] || R2 = [I1++];
- DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
-s$8: SAA (R1:0,R3:2) || R0 = [I0++M0] || R2 = [I1++M1];
- SAA (R1:0,R3:2) (R) || R0 = [I0++] || R2 = [I1++];
-e$8: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
-
- R3=A1.L+A1.H, R2=A0.L+A0.H ;
- R0 = R2 + R3 ;
- RTS;
-DEFUN_END(z_sad8x8)
-
-DEFUN(pix_norm1,mL1,
- (uint8_t * pix, int line_size)):
- [--SP]=(R7:4,P5:3);
-
- // Fetch the input arguments.
- P1 = R0; // pix
- P0 = R1; // line_size
- P5 = 16; // loop ctr.
- P0 -= P5;
- M0 = P0; // M0 = line_size-16;
- // Now for the real work.
- A1 = A0 = 0;
- lsetup(_pix_norm1_blkfn_loopStart, _pix_norm1_blkfn_loopEnd) LC1 = P5;
- I0 = P1;
- DISALGNEXCPT || r0 = [i0++];
-
-_pix_norm1_blkfn_loopStart:
- // following unpacks pix1[0..15] pix1+line_size[0..15]
- DISALGNEXCPT || r1 = [i0++];
-
- (r5, r4) = byteunpack r1:0 || r0 = [i0++];
- a1 += r5.h * r5.h, a0 += r5.l * r5.l (is);
- a1 += r4.h * r4.h, a0 += r4.l * r4.l (is);
- (r5, r4) = byteunpack r1:0(r) || r1 = [i0++];
- a1 += r5.h * r5.h, a0 += r5.l * r5.l (is);
- a1 += r4.h * r4.h, a0 += r4.l * r4.l (is);
- (r5, r4) = byteunpack r1:0 || r0 = [i0++M0];
- a1 += r5.h * r5.h, a0 += r5.l * r5.l (is);
- a1 += r4.h * r4.h, a0 += r4.l * r4.l (is);
- (r5, r4) = byteunpack r1:0(r) || r0 = [i0++];
- a1 += r5.h * r5.h, a0 += r5.l * r5.l (is);
-_pix_norm1_blkfn_loopEnd:
- a1 += r4.h * r4.h, a0 += r4.l * r4.l (is);
-
-
-// Clean up at the end:
- R2 = A0, R3 = A1;
- R0 = R2 + R3 (S);
-
- (R7:4,P5:3)=[SP++];
-
- RTS;
-DEFUN_END(pix_norm1)
-
-DEFUN(sse4,mL1,
- (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)):
- link 0;
- [--sp] = (r7:6);
- p0=[fp+24]; // h
- i0=r1; // pix1
- i1=r2; // pix2
- r2=[fp+20]; // line_size
- r2+=-4;
- m0=r2;
-
- a0=a1=0;
- LSETUP(.S40,.E40) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-.S40: DISALGNEXCPT || R1 = [I0++M0] || R3 = [I1++M0];
- (R7,R6) = BYTEOP16M (R1:0,R3:2);
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
-.E40: a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- a0 += a1;
- r0 = a0;
-
- (r7:6) = [sp++];
- unlink;
- rts;
-DEFUN_END(sse4)
-
-DEFUN(sse8,mL1,
- (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)):
- link 0;
- [--sp] = (r7:6);
- p0=[fp+24]; // h
- i0=r1; // pix1
- i1=r2; // pix2
- r2=[fp+20]; // line_size
- r2+=-8;
- m0=r2;
-
- a0=a1=0;
- LSETUP(.S80,.E80) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-.S80: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- (R7,R6) = BYTEOP16M (R1:0,R3:2) || R0 = [I0++M0] || R2 = [I1++M0];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
- a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- (R7,R6) = BYTEOP16M (R1:0,R3:2) (R)|| R0 = [I0++] || R2 = [I1++];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
-.E80: a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- a0 += a1;
- r0 = a0;
-
- (r7:6) = [sp++];
- unlink;
- rts;
-DEFUN_END(sse8)
-
-DEFUN(sse16,mL1,
- (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)):
- link 0;
- [--sp] = (r7:6);
- p0=[fp+24]; // h
- i0=r1; // pix1
- i1=r2; // pix2
- r2=[fp+20]; // line_size
- r2+=-16;
- m0=r2;
-
- a0=a1=0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
- LSETUP(.S160,.E160) LC0=P0;
-
-.S160: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- (R7,R6) = BYTEOP16M (R1:0,R3:2) || R0 = [I0++] || R2 = [I1++];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
- a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- (R7,R6) = BYTEOP16M (R1:0,R3:2) (R)|| R1 = [I0++] || R3 = [I1++];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
- a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- (R7,R6) = BYTEOP16M (R1:0,R3:2) || R0 = [I0++M0] || R2 = [I1++M0];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
- a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- (R7,R6) = BYTEOP16M (R1:0,R3:2) (R)|| R0 = [I0++] || R2 = [I1++];
- a0 += r7.l * r7.l, a1 += r7.h * r7.h (is);
-.E160: a0 += r6.l * r6.l, a1 += r6.h * r6.h (is);
- a0 += a1;
- r0 = a0;
-
- (r7:6) = [sp++];
- unlink;
- rts;
-DEFUN_END(sse16)
diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c
new file mode 100644
index 0000000..08e0c7b
--- /dev/null
+++ b/libavcodec/bfin/hpeldsp_bfin.c
@@ -0,0 +1,119 @@
+/*
+ * BlackFin DSPUTILS
+ *
+ * Copyright (C) 2007 Marc Hoffman <[email protected]>
+ * Copyright (c) 2006 Michael Benjamin <[email protected]>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/hpeldsp.h"
+#include "hpeldsp_bfin.h"
+
+static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, ptrdiff_t
line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size,
line_size, h);
+}
+
+static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t
line_size, int h)
+{
+ ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
+}
+
+static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
+}
+
+static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
+}
+
+static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size,
line_size, h);
+}
+
+static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
+}
+
+static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
+}
+
+static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size,
h);
+}
+
+
+static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
+}
+
+static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
+}
+
+static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size,
h);
+}
+
+void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags)
+{
+ c->put_pixels_tab[0][0] = bfin_put_pixels16;
+ c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
+ c->put_pixels_tab[0][2] = bfin_put_pixels16_y2;
+ c->put_pixels_tab[0][3] = bfin_put_pixels16_xy2;
+
+ c->put_pixels_tab[1][0] = bfin_put_pixels8;
+ c->put_pixels_tab[1][1] = bfin_put_pixels8_x2;
+ c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
+ c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
+
+ 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
new file mode 100644
index 0000000..cfa0a1b
--- /dev/null
+++ b/libavcodec/bfin/hpeldsp_bfin.h
@@ -0,0 +1,50 @@
+/*
+ * BlackFin DSPUTILS COMMON OPTIMIZATIONS HEADER
+ *
+ * Copyright (C) 2007 Marc Hoffman <[email protected]>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#ifndef AVCODEC_BFIN_HPELDSP_BFIN_H
+#define AVCODEC_BFIN_HPELDSP_BFIN_H
+
+#include <stdint.h>
+
+#include "config.h"
+
+#if defined(__FDPIC__) && CONFIG_SRAM
+#define attribute_l1_text __attribute__ ((l1_text))
+#define attribute_l1_data_b __attribute__((l1_data_B))
+#else
+#define attribute_l1_text
+#define attribute_l1_data_b
+#endif
+
+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;
+void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const
uint8_t *s1, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const
uint8_t *s1, int line_size, int h) attribute_l1_text;
+
+#endif /* AVCODEC_BFIN_HPELDSP_BFIN_H */
diff --git a/libavcodec/bfin/pixels_bfin.S b/libavcodec/bfin/pixels_bfin.S
index 99d4495..70d9de5 100644
--- a/libavcodec/bfin/pixels_bfin.S
+++ b/libavcodec/bfin/pixels_bfin.S
@@ -83,365 +83,6 @@ apc$3: R6 = BYTEOP3P(R1:0, R3:2) (LO) || [I2++M0] = R6
|| R2 = [I1];
RTS;
DEFUN_END(add_pixels_clamped)
-
-/*
- motion compensation
- primitives
-
- * Halfpel motion compensation with rounding (a+b+1)>>1.
- * This is an array[4][4] of motion compensation funcions for 4
- * horizontal blocksizes (8,16) and the 4 halfpel positions<br>
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination where the result is stored
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
-
-*/
-
-DEFUN(put_pixels8uc,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int dest_size, int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r0=[sp+12]; // dest_size
- r2=[sp+16]; // line_size
- p0=[sp+20]; // h
- [--sp] = (r7:6);
- r0+=-4;
- m3=r0;
- r2+=-8;
- m0=r2;
- LSETUP(pp8$0,pp8$1) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp8$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0]|| R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R6 ;
-pp8$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- RTS;
-DEFUN_END(put_pixels8uc)
-
-DEFUN(put_pixels16uc,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int dest_size, int line_size, int h)):
- link 0;
- [--sp] = (r7:6);
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r0=[fp+20]; // dest_size
- r2=[fp+24]; // line_size
- p0=[fp+28]; // h
-
-
- r0+=-12;
- m3=r0; // line_size
- r2+=-16;
- m0=r2;
-
- LSETUP(pp16$0,pp16$1) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp16$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++] || R2 =[I1++];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R1 = [I0++] || R3 =[I1++];
- [I3++] = R6;
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0] || R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R7 ;
- [I3++] = R6;
-pp16$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- unlink;
- RTS;
-DEFUN_END(put_pixels16uc)
-
-
-
-
-
-
-DEFUN(put_pixels8uc_nornd,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r2=[sp+12]; // line_size
- p0=[sp+16]; // h
- [--sp] = (r7:6);
- r2+=-4;
- m3=r2;
- r2+=-4;
- m0=r2;
- LSETUP(pp8$2,pp8$3) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp8$2: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0]|| R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R6 ;
-pp8$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- RTS;
-DEFUN_END(put_pixels8uc_nornd)
-
-DEFUN(put_pixels16uc_nornd,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r2=[sp+12]; // line_size
- p0=[sp+16]; // h
-
- [--sp] = (r7:6);
- r2+=-12;
- m3=r2; // line_size
- r2+=-4;
- m0=r2;
-
- LSETUP(pp16$2,pp16$3) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp16$2:
- DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++] || R2 =[I1++];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R1 = [I0++] || R3 =[I1++];
- [I3++] = R6;
-
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0] || R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R7 ;
- [I3++] = R6;
-pp16$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
-
- RTS;
-DEFUN_END(put_pixels16uc_nornd)
-
-DEFUN(z_put_pixels16_xy2,mL1,
- (uint8_t *block, const uint8_t *s0,
- int dest_size, int line_size, int h)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- r2+=-12;
- m2=r2; // m2=dest_width-4
- r2=[fp+20];
- m3=r2; // line_size
- p0=[fp+24]; // h
- r2+=-16;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
-
- B0 = I0;
- B1 = I1;
- B3 = I3;
-
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
- LSETUP(LS$16E,LE$16E) LC0=P0;
-LS$16E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R1 = [I0++] || [I3++] = R4 ;
- DISALGNEXCPT || R3 = [I1++] || [I3++] = R5;
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$16E: 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$16O,LE$16O) LC0=P0;
-LS$16O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,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) (RNDH) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 = [I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$16O: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- unlink;
- 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)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- r2+=-4;
- m2=r2; // m2=dest_width-4
- r2=[fp+20];
- m3=r2; // line_size
- p0=[fp+24]; // h
- r2+=-8;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
-
- b0 = I0;
- b1 = I1;
- b3 = I3;
-
- LSETUP(LS$8E,LE$8E) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-LS$8E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0] || R2 =[I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$8E: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- M1 = 1;
- I3 = b3;
- I1 = b1;
- I0 = b0;
-
- I0 += M1;
- I1 += M1;
-
- LSETUP(LS$8O,LE$8O) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-LS$8O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++M0] || R2 =[I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 =[I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$8O: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- 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)
-
DEFUN(diff_pixels,mL1,
(int16_t *block, uint8_t *s1, uint8_t *s2, int stride)):
link 0;
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c
index 35c6d47..a3826c7 100644
--- a/libavcodec/hpeldsp.c
+++ b/libavcodec/hpeldsp.c
@@ -55,6 +55,7 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags)
hpel_funcs(avg_no_rnd,, 16);
if (ARCH_ARM) ff_hpeldsp_init_arm (c, flags);
+ if (ARCH_BFIN) ff_hpeldsp_init_bfin (c, flags);
if (ARCH_PPC) ff_hpeldsp_init_ppc (c, flags);
if (ARCH_X86) ff_hpeldsp_init_x86 (c, flags);
}
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
index da734fc..f875554 100644
--- a/libavcodec/hpeldsp.h
+++ b/libavcodec/hpeldsp.h
@@ -95,6 +95,7 @@ typedef struct HpelDSPContext {
void ff_hpeldsp_init(HpelDSPContext *c, int flags);
void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags);
+void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
