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

Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'

Browse Source 
* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
  bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/bfin/Makefile
	libavcodec/bfin/hpel_pixels_bfin.S
	libavcodec/bfin/hpeldsp_bfin.c
	libavcodec/bfin/hpeldsp_bfin.h
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-20 14:29:16 +02:00
commit c5a11ab6d1
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bfin/Makefile
View File

@ -3,7 +3,7 @@ OBJS += bfin/dsputil_bfin.o \
bfin/idct_bfin.o \ bfin/idct_bfin.o \
bfin/pixels_bfin.o \ bfin/pixels_bfin.o \
OBJS-$(CONFIG_HPELDS) += bfin/hpeldsp_bfin.o \ OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_bfin.o \
bfin/hpel_pixels_bfin.o bfin/hpel_pixels_bfin.o
OBJS-$(CONFIG_MPEGVIDEOENC) += bfin/mpegvideo_bfin.o OBJS-$(CONFIG_MPEGVIDEOENC) += bfin/mpegvideo_bfin.o
OBJS-$(CONFIG_VP3DSP) += bfin/vp3_bfin.o \ OBJS-$(CONFIG_VP3DSP) += bfin/vp3_bfin.o \

2
libavcodec/bfin/hpel_pixels_bfin.S
View File

@ -20,7 +20,7 @@
*/ */
#include "config_bfin.h" #include "config_bfin.h"
/** /*
motion compensation motion compensation
primitives primitives

6
libavcodec/bfin/hpeldsp_bfin.c
View File

@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stddef.h>
#include <stdint.h>
#include "libavutil/attributes.h"
#include "libavcodec/hpeldsp.h" #include "libavcodec/hpeldsp.h"
#include "hpeldsp_bfin.h" #include "hpeldsp_bfin.h"
@ -95,7 +99,7 @@ static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, p
ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h); ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
} }
void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags) av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
{ {
c->put_pixels_tab[0][0] = bfin_put_pixels16; c->put_pixels_tab[0][0] = bfin_put_pixels16;
c->put_pixels_tab[0][1] = bfin_put_pixels16_x2; c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;

12
libavcodec/hpeldsp.c
View File

@ -54,14 +54,18 @@ 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_ALPHA)
ff_hpeldsp_init_alpha(c, flags);
if (ARCH_ARM) if (ARCH_ARM)
ff_hpeldsp_init_arm(c, flags); ff_hpeldsp_init_arm(c, flags);
if (ARCH_BFIN)
ff_hpeldsp_init_bfin(c, flags);
if (ARCH_PPC) if (ARCH_PPC)
ff_hpeldsp_init_ppc(c, flags); ff_hpeldsp_init_ppc(c, flags);
if (ARCH_SH4)
ff_hpeldsp_init_sh4(c, flags);
if (HAVE_VIS)
ff_hpeldsp_init_vis(c, flags);
if (ARCH_X86) if (ARCH_X86)
ff_hpeldsp_init_x86(c, flags); ff_hpeldsp_init_x86(c, flags);
if (HAVE_VIS) ff_hpeldsp_init_vis (c, flags);
if (ARCH_ALPHA) ff_hpeldsp_init_alpha (c, flags);
if (ARCH_SH4) ff_hpeldsp_init_sh4 (c, flags);
if (ARCH_BFIN) ff_hpeldsp_init_bfin (c, flags);
} }

2
libavcodec/hpeldsp.h
View File

@ -100,9 +100,9 @@ void ff_hpeldsp_init(HpelDSPContext *c, int flags);
void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags); void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_arm(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_bfin(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags); void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags); void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags); void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags);
void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
#endif /* AVCODEC_HPELDSP_H */ #endif /* AVCODEC_HPELDSP_H */