virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'

Browse Source 
* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
  ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.h
	libavcodec/ppc/hpeldsp_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-20 13:52:58 +02:00
commit 055e5c8e01
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hpeldsp.c
View File

@ -54,6 +54,8 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags)
hpel_funcs(avg, [3], 2); hpel_funcs(avg, [3], 2);
hpel_funcs(avg_no_rnd,, 16); hpel_funcs(avg_no_rnd,, 16);
if (ARCH_PPC)
ff_hpeldsp_init_ppc(c, flags);
if (ARCH_X86) if (ARCH_X86)
ff_hpeldsp_init_x86(c, flags); ff_hpeldsp_init_x86(c, flags);
if (ARCH_ARM) ff_hpeldsp_init_arm (c, flags); if (ARCH_ARM) ff_hpeldsp_init_arm (c, flags);

16
libavcodec/ppc/hpeldsp_altivec.c
View File

@ -444,20 +444,22 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
} }
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags) av_cold void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags)
{ {
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
if (mm_flags & AV_CPU_FLAG_ALTIVEC) { if (mm_flags & AV_CPU_FLAG_ALTIVEC) {
c->put_pixels_tab[0][0] = ff_put_pixels16_altivec; c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec;
c->avg_pixels_tab[1][0] = avg_pixels8_altivec;
c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec;
c->put_pixels_tab[0][0] = ff_put_pixels16_altivec;
c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec;
c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec;
c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec; c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec;
c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec;
c->avg_pixels_tab[1][0] = avg_pixels8_altivec;
c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec;
c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec;
c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec; c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec;
c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec;
c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec; c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec;
} }
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */