generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1

Browse Source 
The original patch  seems to be missing a 16x16 function though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-20 20:19:17 +02:00
parent 319235c67c
commit af89a685c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/arm/vc1dsp_init_neon.c
View File

@ -38,7 +38,7 @@ void ff_put_pixels8x8_neon(uint8_t *block, const uint8_t *pixels,
#define DECL_PUT(X, Y) \ #define DECL_PUT(X, Y) \
void ff_put_vc1_mspel_mc##X##Y##_neon(uint8_t *dst, const uint8_t *src, \ void ff_put_vc1_mspel_mc##X##Y##_neon(uint8_t *dst, const uint8_t *src, \
ptrdiff_t stride, int rnd); \ ptrdiff_t stride, int rnd); \
void ff_put_vc1_mspel_mc##X##Y##_16_neon(uint8_t *dst, const uint8_t *src, \ static void ff_put_vc1_mspel_mc##X##Y##_16_neon(uint8_t *dst, const uint8_t *src, \
ptrdiff_t stride, int rnd) \ ptrdiff_t stride, int rnd) \
{ \ { \
ff_put_vc1_mspel_mc##X##Y##_neon(dst+0, src+0, stride, rnd); \ ff_put_vc1_mspel_mc##X##Y##_neon(dst+0, src+0, stride, rnd); \
@ -78,7 +78,7 @@ void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h,
int x, int y); int x, int y);
#define FN_ASSIGN(X, Y) \ #define FN_ASSIGN(X, Y) \
dsp->put_vc1_mspel_pixels_tab[0][X+4*Y] = ff_put_vc1_mspel_mc##X##Y##_16_neon; dsp->put_vc1_mspel_pixels_tab[0][X+4*Y] = ff_put_vc1_mspel_mc##X##Y##_16_neon; \
dsp->put_vc1_mspel_pixels_tab[1][X+4*Y] = ff_put_vc1_mspel_mc##X##Y##_neon dsp->put_vc1_mspel_pixels_tab[1][X+4*Y] = ff_put_vc1_mspel_mc##X##Y##_neon
av_cold void ff_vc1dsp_init_neon(VC1DSPContext *dsp) av_cold void ff_vc1dsp_init_neon(VC1DSPContext *dsp)
@ -92,8 +92,8 @@ av_cold void ff_vc1dsp_init_neon(VC1DSPContext *dsp)
dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_neon; dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_neon;
dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_neon; dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_neon;
dsp->put_vc1_mspel_pixels_tab[0][ 0] = ff_put_pixels16x16_neon;
dsp->put_vc1_mspel_pixels_tab[1][ 0] = ff_put_pixels8x8_neon; dsp->put_vc1_mspel_pixels_tab[1][ 0] = ff_put_pixels8x8_neon;
FN_ASSIGN(1, 0);
FN_ASSIGN(2, 0); FN_ASSIGN(2, 0);
FN_ASSIGN(3, 0); FN_ASSIGN(3, 0);