virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'

Browse Source 
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-20 15:24:25 +02:00
commit 6ec26157b9
6 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/alpha/dsputil_alpha_asm.S
View File

@ -26,17 +26,6 @@
#include "regdef.h" #include "regdef.h"
/* Some nicer register names. */
#define ta t10
#define tb t11
#define tc t12
#define td AT
/* Danger: these overlap with the argument list and the return value */
#define te a5
#define tf a4
#define tg a3
#define th v0
.set noat .set noat
.set noreorder .set noreorder
.arch pca56 .arch pca56

3
libavcodec/alpha/hpeldsp_alpha.c
View File

@ -19,6 +19,7 @@
* 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 "libavutil/attributes.h"
#include "libavcodec/hpeldsp.h" #include "libavcodec/hpeldsp.h"
#include "hpeldsp_alpha.h" #include "hpeldsp_alpha.h"
#include "asm.h" #include "asm.h"
@ -173,7 +174,7 @@ static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
put_pixels_axp_asm(block + 8, pixels + 8, line_size, h); put_pixels_axp_asm(block + 8, pixels + 8, line_size, h);
} }
void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags) av_cold void ff_hpeldsp_init_alpha(HpelDSPContext *c, int flags)
{ {
c->put_pixels_tab[0][0] = put_pixels16_axp_asm; c->put_pixels_tab[0][0] = put_pixels16_axp_asm;
c->put_pixels_tab[0][1] = put_pixels16_x2_axp; c->put_pixels_tab[0][1] = put_pixels16_x2_axp;

1
libavcodec/alpha/hpeldsp_alpha.h
View File

@ -20,6 +20,7 @@
#define AVCODEC_ALPHA_HPELDSP_ALPHA_H #define AVCODEC_ALPHA_HPELDSP_ALPHA_H
#include <stdint.h> #include <stdint.h>
#include <stddef.h>
void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels, void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h); ptrdiff_t line_size, int h);

10
libavcodec/alpha/hpeldsp_alpha_asm.S
View File

@ -26,16 +26,6 @@
#include "regdef.h" #include "regdef.h"
/* Some nicer register names. */
#define ta t10
#define tb t11
#define tc t12
#define td AT
/* Danger: these overlap with the argument list and the return value */
#define te a5
#define tf a4
#define tg a3
#define th v0
.set noat .set noat
.set noreorder .set noreorder

11
libavcodec/alpha/regdef.h
View File

@ -63,4 +63,15 @@
#define sp $30 /* stack pointer */ #define sp $30 /* stack pointer */
#define zero $31 /* reads as zero, writes are noops */ #define zero $31 /* reads as zero, writes are noops */
/* Some nicer register names. */
#define ta t10
#define tb t11
#define tc t12
#define td AT
/* Danger: these overlap with the argument list and the return value */
#define te a5
#define tf a4
#define tg a3
#define th v0
#endif /* AVCODEC_ALPHA_REGDEF_H */ #endif /* AVCODEC_ALPHA_REGDEF_H */

14
libavcodec/hpeldsp.h
View File

@ -97,12 +97,12 @@ typedef struct HpelDSPContext {
void ff_hpeldsp_init(HpelDSPContext *c, int flags); 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_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); void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags);
#endif /* AVCODEC_HPELDSP_H */ #endif /* AVCODEC_HPELDSP_H */