[FFmpeg-cvslog] r20186 - in trunk/libavcodec/arm: dsputil_arm.S dsputil_init_arm.c jrevdct_arm.S simple_idct_arm.S
mru
subversion
Tue Oct 6 23:55:41 CEST 2009
Author: mru
Date: Tue Oct 6 23:55:41 2009
New Revision: 20186
Log:
ARM: make function names all-lowercase
Modified:
trunk/libavcodec/arm/dsputil_arm.S
trunk/libavcodec/arm/dsputil_init_arm.c
trunk/libavcodec/arm/jrevdct_arm.S
trunk/libavcodec/arm/simple_idct_arm.S
Modified: trunk/libavcodec/arm/dsputil_arm.S
==============================================================================
--- trunk/libavcodec/arm/dsputil_arm.S Tue Oct 6 23:55:37 2009 (r20185)
+++ trunk/libavcodec/arm/dsputil_arm.S Tue Oct 6 23:55:41 2009 (r20186)
@@ -622,8 +622,8 @@ function ff_put_no_rnd_pixels8_xy2_arm,
.endfunc
.align 5
-@ void ff_add_pixels_clamped_ARM(int16_t *block, uint8_t *dest, int stride)
-function ff_add_pixels_clamped_ARM, export=1
+@ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)
+function ff_add_pixels_clamped_arm, export=1
push {r4-r10}
mov r10, #8
1:
Modified: trunk/libavcodec/arm/dsputil_init_arm.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_init_arm.c Tue Oct 6 23:55:37 2009 (r20185)
+++ trunk/libavcodec/arm/dsputil_init_arm.c Tue Oct 6 23:55:41 2009 (r20186)
@@ -22,8 +22,8 @@
#include "libavcodec/dsputil.h"
#include "dsputil_arm.h"
-void ff_j_rev_dct_ARM(DCTELEM *data);
-void ff_simple_idct_ARM(DCTELEM *data);
+void ff_j_rev_dct_arm(DCTELEM *data);
+void ff_simple_idct_arm(DCTELEM *data);
/* XXX: local hack */
static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
@@ -47,29 +47,29 @@ CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2
CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm, ff_put_no_rnd_pixels8_y2_arm, 8)
CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8)
-void ff_add_pixels_clamped_ARM(const DCTELEM *block, uint8_t *dest,
+void ff_add_pixels_clamped_arm(const DCTELEM *block, uint8_t *dest,
int line_size);
/* XXX: those functions should be suppressed ASAP when all IDCTs are
converted */
-static void j_rev_dct_ARM_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void j_rev_dct_arm_put(uint8_t *dest, int line_size, DCTELEM *block)
{
- ff_j_rev_dct_ARM (block);
+ ff_j_rev_dct_arm (block);
ff_put_pixels_clamped(block, dest, line_size);
}
-static void j_rev_dct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void j_rev_dct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)
{
- ff_j_rev_dct_ARM (block);
+ ff_j_rev_dct_arm (block);
ff_add_pixels_clamped(block, dest, line_size);
}
-static void simple_idct_ARM_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void simple_idct_arm_put(uint8_t *dest, int line_size, DCTELEM *block)
{
- ff_simple_idct_ARM (block);
+ ff_simple_idct_arm (block);
ff_put_pixels_clamped(block, dest, line_size);
}
-static void simple_idct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)
{
- ff_simple_idct_ARM (block);
+ ff_simple_idct_arm (block);
ff_add_pixels_clamped(block, dest, line_size);
}
@@ -86,19 +86,19 @@ void dsputil_init_arm(DSPContext* c, AVC
if (!avctx->lowres) {
if(avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_ARM){
- c->idct_put = j_rev_dct_ARM_put;
- c->idct_add = j_rev_dct_ARM_add;
- c->idct = ff_j_rev_dct_ARM;
+ c->idct_put = j_rev_dct_arm_put;
+ c->idct_add = j_rev_dct_arm_add;
+ c->idct = ff_j_rev_dct_arm;
c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
} else if (avctx->idct_algo == FF_IDCT_SIMPLEARM){
- c->idct_put = simple_idct_ARM_put;
- c->idct_add = simple_idct_ARM_add;
- c->idct = ff_simple_idct_ARM;
+ c->idct_put = simple_idct_arm_put;
+ c->idct_add = simple_idct_arm_add;
+ c->idct = ff_simple_idct_arm;
c->idct_permutation_type = FF_NO_IDCT_PERM;
}
}
- c->add_pixels_clamped = ff_add_pixels_clamped_ARM;
+ c->add_pixels_clamped = ff_add_pixels_clamped_arm;
c->put_pixels_tab[0][0] = ff_put_pixels16_arm;
c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm;
Modified: trunk/libavcodec/arm/jrevdct_arm.S
==============================================================================
--- trunk/libavcodec/arm/jrevdct_arm.S Tue Oct 6 23:55:37 2009 (r20185)
+++ trunk/libavcodec/arm/jrevdct_arm.S Tue Oct 6 23:55:41 2009 (r20186)
@@ -1,6 +1,6 @@
/*
C-like prototype :
- void j_rev_dct_ARM(DCTBLOCK data)
+ void j_rev_dct_arm(DCTBLOCK data)
With DCTBLOCK being a pointer to an array of 64 'signed shorts'
@@ -57,7 +57,7 @@
.text
.align
-function ff_j_rev_dct_ARM, export=1
+function ff_j_rev_dct_arm, export=1
stmdb sp!, { r4 - r12, lr } @ all callee saved regs
sub sp, sp, #4 @ reserve some space on the stack
Modified: trunk/libavcodec/arm/simple_idct_arm.S
==============================================================================
--- trunk/libavcodec/arm/simple_idct_arm.S Tue Oct 6 23:55:37 2009 (r20185)
+++ trunk/libavcodec/arm/simple_idct_arm.S Tue Oct 6 23:55:41 2009 (r20186)
@@ -56,8 +56,8 @@
.text
-function ff_simple_idct_ARM, export=1
- @@ void simple_idct_ARM(int16_t *block)
+function ff_simple_idct_arm, export=1
+ @@ void simple_idct_arm(int16_t *block)
@@ save stack for reg needed (take all of them),
@@ R0-R3 are scratch regs, so no need to save them, but R0 contains the pointer to block
@@ so it must not be overwritten, if it is not saved!!
@@ -458,7 +458,7 @@ __end_col_loop:
-__end_simple_idct_ARM:
+__end_simple_idct_arm:
@@ restore registers to previous status!
add sp, sp, #8 @@ the local variables!
ldmfd sp!, {r4-r11, r15} @@ update PC with LR content.
More information about the ffmpeg-cvslog
mailing list