Commit a2fc0f6a authored by Måns Rullgård's avatar Måns Rullgård
Browse files

ARM: replace "armv4l" with "arm"

Originally committed as revision 16179 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2600f8c8
......@@ -789,7 +789,7 @@ THREADS_LIST='
ARCH_LIST='
alpha
armv4l
arm
bfin
ia64
m68k
......@@ -933,14 +933,14 @@ CMDLINE_SET="
# architecture extensions
altivec_deps="powerpc"
armv5te_deps="armv4l"
armv6_deps="armv4l"
armvfp_deps="armv4l"
iwmmxt_deps="armv4l"
armv5te_deps="arm"
armv6_deps="arm"
armvfp_deps="arm"
iwmmxt_deps="arm"
mmi_deps="mips"
mmx_deps="x86"
mmx2_deps="x86 mmx"
neon_deps="armv4l"
neon_deps="arm"
ssse3_deps="x86"
vis_deps="sparc"
......@@ -1309,9 +1309,8 @@ case "$arch" in
int test[sizeof(char*) - 7];
EOF
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
arch="armv4l"
arch="arm"
;;
alpha)
arch="alpha"
......@@ -1785,7 +1784,7 @@ EOF
fi
# We have to check if pld is a nop and disable it.
enabled armv4l && check_asm pld '"pld [r0]"'
enabled arm && check_asm pld '"pld [r0]"'
enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"'
enabled armvfp && check_asm armvfp '"fadds s0, s0, s0"'
......@@ -2136,7 +2135,7 @@ if test $arch = "x86_32" -o $arch = "x86_64"; then
echo "EBX available ${ebx_available-no}"
echo "EBP available ${ebp_available-no}"
fi
if test $arch = "armv4l"; then
if test $arch = "arm"; then
echo "ARMv5TE enabled ${armv5te-no}"
echo "ARMv6 enabled ${armv6-no}"
echo "ARM VFP enabled ${armvfp-no}"
......@@ -2358,7 +2357,7 @@ if enabled source_path_used; then
doc \
libavcodec \
libavcodec/alpha \
libavcodec/armv4l \
libavcodec/arm \
libavcodec/bfin \
libavcodec/i386 \
libavcodec/mlib \
......
......@@ -429,29 +429,29 @@ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \
OBJS-$(ARCH_ARMV4L) += armv4l/dsputil_arm.o \
armv4l/dsputil_arm_s.o \
armv4l/jrevdct_arm.o \
armv4l/mpegvideo_arm.o \
armv4l/simple_idct_arm.o \
OBJS-$(ARCH_ARM) += arm/dsputil_arm.o \
arm/dsputil_arm_s.o \
arm/jrevdct_arm.o \
arm/mpegvideo_arm.o \
arm/simple_idct_arm.o \
OBJS-$(HAVE_ARMV5TE) += armv4l/mpegvideo_armv5te.o \
armv4l/mpegvideo_armv5te_s.o \
armv4l/simple_idct_armv5te.o \
OBJS-$(HAVE_ARMV5TE) += arm/mpegvideo_armv5te.o \
arm/mpegvideo_armv5te_s.o \
arm/simple_idct_armv5te.o \
OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \
OBJS-$(HAVE_ARMV6) += arm/simple_idct_armv6.o \
OBJS-$(HAVE_ARMVFP) += armv4l/dsputil_vfp.o \
armv4l/float_arm_vfp.o \
OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
arm/float_arm_vfp.o \
OBJS-$(HAVE_IWMMXT) += armv4l/dsputil_iwmmxt.o \
armv4l/mpegvideo_iwmmxt.o \
OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
arm/mpegvideo_iwmmxt.o \
OBJS-$(HAVE_NEON) += armv4l/dsputil_neon.o \
armv4l/dsputil_neon_s.o \
armv4l/h264dsp_neon.o \
armv4l/h264idct_neon.o \
armv4l/simple_idct_neon.o \
OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \
arm/dsputil_neon_s.o \
arm/h264dsp_neon.o \
arm/h264idct_neon.o \
arm/simple_idct_neon.o \
OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
bfin/fdct_bfin.o \
......@@ -499,7 +499,7 @@ TESTS-$(CONFIG_OLDSCALER) += imgresample-test$(EXESUF)
TESTS-$(ARCH_X86) += i386/cpuid-test$(EXESUF) motion-test$(EXESUF)
CLEANFILES = apiexample$(EXESUF)
DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
DIRS = alpha arm bfin i386 mlib ppc ps2 sh4 sparc
include $(SUBDIR)../subdir.mak
......
/*
* ARMv4L optimized DSP utils
* ARM optimized DSP utils
* Copyright (c) 2001 Lionel Ulmer.
*
* This file is part of FFmpeg.
......@@ -121,7 +121,7 @@ int mm_support(void)
return ENABLE_IWMMXT * FF_MM_IWMMXT;
}
void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx)
void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
{
int idct_algo= avctx->idct_algo;
......
@
@ ARMv4L optimized DSP utils
@ ARMv4 optimized DSP utils
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@
@ This file is part of FFmpeg.
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_ARMV4L_MATHOPS_H
#define AVCODEC_ARMV4L_MATHOPS_H
#ifndef AVCODEC_ARM_MATHOPS_H
#define AVCODEC_ARM_MATHOPS_H
#include <stdint.h>
#include "libavutil/common.h"
......@@ -90,4 +90,4 @@ static inline av_const MUL16(int ra, int rb)
#endif
#endif /* AVCODEC_ARMV4L_MATHOPS_H */
#endif /* AVCODEC_ARM_MATHOPS_H */
......@@ -25,7 +25,7 @@
void MPV_common_init_iwmmxt(MpegEncContext *s);
void MPV_common_init_armv5te(MpegEncContext *s);
void MPV_common_init_armv4l(MpegEncContext *s)
void MPV_common_init_arm(MpegEncContext *s)
{
/* IWMMXT support is a superset of armv5te, so
* allow optimized functions for armv5te unless
......
......@@ -41,7 +41,7 @@
//#define ALT_BITSTREAM_WRITER
//#define ALIGNED_BITSTREAM_WRITER
#if !defined(LIBMPEG2_BITSTREAM_READER) && !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER)
# ifdef ARCH_ARMV4L
# ifdef ARCH_ARM
# define A32_BITSTREAM_READER
# else
# define ALT_BITSTREAM_READER
......@@ -179,7 +179,7 @@ typedef struct RL_VLC_ELEM {
uint8_t run;
} RL_VLC_ELEM;
#if defined(ARCH_SPARC) || defined(ARCH_ARMV4L) || defined(ARCH_MIPS) || defined(ARCH_BFIN)
#if defined(ARCH_SPARC) || defined(ARCH_ARM) || defined(ARCH_MIPS) || defined(ARCH_BFIN)
#define UNALIGNED_STORES_ARE_BAD
#endif
......
......@@ -123,7 +123,7 @@ struct algo algos[] = {
{"BFINidct", 1, ff_bfin_idct, idct, NO_PERM},
#endif
#ifdef ARCH_ARMV4L
#ifdef ARCH_ARM
{"SIMPLE-ARM", 1, simple_idct_ARM, idct, NO_PERM },
{"INT-ARM", 1, j_rev_dct_ARM, idct, MMX_PERM },
#ifdef HAVE_ARMV5TE
......@@ -135,7 +135,7 @@ struct algo algos[] = {
#ifdef HAVE_NEON
{"SIMPLE-NEON", 1, ff_simple_idct_neon, idct, PARTTRANS_PERM },
#endif
#endif /* ARCH_ARMV4L */
#endif /* ARCH_ARM */
{ 0 }
};
......
......@@ -4554,7 +4554,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab));
if (ENABLE_MMX) dsputil_init_mmx (c, avctx);
if (ENABLE_ARMV4L) dsputil_init_armv4l(c, avctx);
if (ENABLE_ARM) dsputil_init_arm (c, avctx);
if (ENABLE_MLIB) dsputil_init_mlib (c, avctx);
if (ENABLE_VIS) dsputil_init_vis (c, avctx);
if (ENABLE_ALPHA) dsputil_init_alpha (c, avctx);
......
......@@ -558,7 +558,7 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){
int mm_support(void);
void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx);
......@@ -593,7 +593,7 @@ static inline void emms(void)
void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
#elif defined(ARCH_ARMV4L)
#elif defined(ARCH_ARM)
extern int mm_flags;
......
......@@ -28,9 +28,9 @@
#include "i386/mathops.h"
#elif defined(ARCH_ARMV4L)
#elif defined(ARCH_ARM)
#include "armv4l/mathops.h"
#include "arm/mathops.h"
#elif defined(ARCH_POWERPC)
......
......@@ -129,8 +129,8 @@ int ff_dct_common_init(MpegEncContext *s)
MPV_common_init_mlib(s);
#elif defined(HAVE_MMI)
MPV_common_init_mmi(s);
#elif defined(ARCH_ARMV4L)
MPV_common_init_armv4l(s);
#elif defined(ARCH_ARM)
MPV_common_init_arm(s);
#elif defined(HAVE_ALTIVEC)
MPV_common_init_altivec(s);
#elif defined(ARCH_BFIN)
......
......@@ -684,7 +684,7 @@ void MPV_common_init_mmx(MpegEncContext *s);
void MPV_common_init_axp(MpegEncContext *s);
void MPV_common_init_mlib(MpegEncContext *s);
void MPV_common_init_mmi(MpegEncContext *s);
void MPV_common_init_armv4l(MpegEncContext *s);
void MPV_common_init_arm(MpegEncContext *s);
void MPV_common_init_altivec(MpegEncContext *s);
void ff_clean_intra_table_entries(MpegEncContext *s);
void ff_draw_horiz_band(MpegEncContext *s, int y, int h);
......
......@@ -30,7 +30,7 @@
#include "config.h"
#include "common.h"
#if defined(ARCH_ARMV4L)
#if defined(ARCH_ARM)
# include "arm/bswap.h"
#elif defined(ARCH_BFIN)
# include "bfin/bswap.h"
......
......@@ -148,7 +148,7 @@ static inline av_const int FASTDIV(int a, int b)
: "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
return r;
}
#elif defined(ARCH_ARMV4L)
#elif defined(ARCH_ARM)
# define FASTDIV(a,b) \
({\
int ret,dmy;\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment