[FFmpeg-cvslog] r20164 - in trunk/libavcodec: Makefile arm/dsputil_arm.S arm/dsputil_arm.c arm/dsputil_arm.h arm/dsputil_arm_s.S arm/dsputil_init_arm.c arm/dsputil_init_neon.c arm/dsputil_init_vfp.c arm/dsputil_ne...

[mru]

Author: mru
Date: Sun Oct  4 15:13:02 2009
New Revision: 20164

Log:
ARM: clean up file/function naming conventions

Added:
   trunk/libavcodec/arm/dsputil_arm.S
      - copied, changed from r20163, trunk/libavcodec/arm/dsputil_arm_s.S
   trunk/libavcodec/arm/dsputil_init_arm.c
      - copied, changed from r20163, trunk/libavcodec/arm/dsputil_arm.c
   trunk/libavcodec/arm/dsputil_init_neon.c
      - copied, changed from r20163, trunk/libavcodec/arm/dsputil_neon.c
   trunk/libavcodec/arm/dsputil_init_vfp.c
      - copied, changed from r20163, trunk/libavcodec/arm/float_arm_vfp.c
   trunk/libavcodec/arm/dsputil_neon.S
      - copied, changed from r20163, trunk/libavcodec/arm/dsputil_neon_s.S
Deleted:
   trunk/libavcodec/arm/dsputil_arm.c
   trunk/libavcodec/arm/dsputil_arm_s.S
   trunk/libavcodec/arm/dsputil_neon.c
   trunk/libavcodec/arm/dsputil_neon_s.S
   trunk/libavcodec/arm/float_arm_vfp.c
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/arm/dsputil_arm.h

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Oct  4 15:12:55 2009	(r20163)
+++ trunk/libavcodec/Makefile	Sun Oct  4 15:13:02 2009	(r20164)
@@ -480,8 +480,8 @@ OBJS-$(ARCH_ALPHA)                     +
                                           alpha/mpegvideo_alpha.o       \
                                           alpha/simple_idct_alpha.o     \
 
-OBJS-$(ARCH_ARM)                       += arm/dsputil_arm.o             \
-                                          arm/dsputil_arm_s.o           \
+OBJS-$(ARCH_ARM)                       += arm/dsputil_init_arm.o        \
+                                          arm/dsputil_arm.o             \
                                           arm/fft_init_arm.o            \
                                           arm/jrevdct_arm.o             \
                                           arm/mpegvideo_arm.o           \
@@ -496,7 +496,7 @@ OBJS-$(HAVE_ARMV6)                     +
                                           arm/simple_idct_armv6.o       \
 
 OBJS-$(HAVE_ARMVFP)                    += arm/dsputil_vfp.o             \
-                                          arm/float_arm_vfp.o           \
+                                          arm/dsputil_init_vfp.o        \
 
 OBJS-$(HAVE_IWMMXT)                    += arm/dsputil_iwmmxt.o          \
                                           arm/mpegvideo_iwmmxt.o        \
@@ -510,8 +510,8 @@ NEON-OBJS-$(CONFIG_H264_DECODER)       +
 
 NEON-OBJS-$(CONFIG_VP3_DECODER)        += arm/vp3dsp_neon.o
 
-OBJS-$(HAVE_NEON)                      += arm/dsputil_neon.o            \
-                                          arm/dsputil_neon_s.o          \
+OBJS-$(HAVE_NEON)                      += arm/dsputil_init_neon.o       \
+                                          arm/dsputil_neon.o            \
                                           arm/simple_idct_neon.o        \
                                           $(NEON-OBJS-yes)
 

Copied and modified: trunk/libavcodec/arm/dsputil_arm.S (from r20163, trunk/libavcodec/arm/dsputil_arm_s.S)
==============================================================================

Modified: trunk/libavcodec/arm/dsputil_arm.h
==============================================================================
--- trunk/libavcodec/arm/dsputil_arm.h	Sun Oct  4 15:12:55 2009	(r20163)
+++ trunk/libavcodec/arm/dsputil_arm.h	Sun Oct  4 15:13:02 2009	(r20164)
@@ -23,7 +23,7 @@
 
 void ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx);
-void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx);
+void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
 void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx);
 

Copied and modified: trunk/libavcodec/arm/dsputil_init_arm.c (from r20163, trunk/libavcodec/arm/dsputil_arm.c)
==============================================================================
--- trunk/libavcodec/arm/dsputil_arm.c	Sun Oct  4 15:12:55 2009	(r20163, copy source)
+++ trunk/libavcodec/arm/dsputil_init_arm.c	Sun Oct  4 15:13:02 2009	(r20164)
@@ -122,7 +122,7 @@ void dsputil_init_arm(DSPContext* c, AVC
     dsputil_init_iwmmxt(c, avctx);
 #endif
 #if HAVE_ARMVFP
-    ff_float_init_arm_vfp(c, avctx);
+    ff_dsputil_init_vfp(c, avctx);
 #endif
 #if HAVE_NEON
     ff_dsputil_init_neon(c, avctx);

Copied and modified: trunk/libavcodec/arm/dsputil_init_neon.c (from r20163, trunk/libavcodec/arm/dsputil_neon.c)
==============================================================================

Copied and modified: trunk/libavcodec/arm/dsputil_init_vfp.c (from r20163, trunk/libavcodec/arm/float_arm_vfp.c)
==============================================================================
--- trunk/libavcodec/arm/float_arm_vfp.c	Sun Oct  4 15:12:55 2009	(r20163, copy source)
+++ trunk/libavcodec/arm/dsputil_init_vfp.c	Sun Oct  4 15:13:02 2009	(r20164)
@@ -26,7 +26,7 @@ void ff_vector_fmul_reverse_vfp(float *d
                                 const float *src1, int len);
 void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len);
 
-void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx)
+void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx)
 {
     c->vector_fmul = ff_vector_fmul_vfp;
     c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;

Copied and modified: trunk/libavcodec/arm/dsputil_neon.S (from r20163, trunk/libavcodec/arm/dsputil_neon_s.S)
==============================================================================