diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-05-02 19:01:37 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-05-02 19:01:37 +0000 |
commit | b95326da292f4b7085b1d4ddbedc9c2cbe5d5e30 (patch) | |
tree | aba61442c919934e6bf00cbac9ca944177229e35 /apps | |
parent | 7aaae54afcda1f4ea5224d3d9d0ac3ffd69defaf (diff) | |
download | rockbox-b95326da292f4b7085b1d4ddbedc9c2cbe5d5e30.tar.gz rockbox-b95326da292f4b7085b1d4ddbedc9c2cbe5d5e30.zip |
Change naming of arm asm routines in libmad's synthesis to match their functionality.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25784 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/libmad/synth.c | 24 | ||||
-rw-r--r-- | apps/codecs/libmad/synth_full_arm.S | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c index d51d291a09..1575d93667 100644 --- a/apps/codecs/libmad/synth.c +++ b/apps/codecs/libmad/synth.c | |||
@@ -880,16 +880,16 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame, | |||
880 | : "r0", "r1", "r2", "r3", "r4"); \ | 880 | : "r0", "r1", "r2", "r3", "r4"); \ |
881 | }) | 881 | }) |
882 | 882 | ||
883 | void synth_full_odd_band (mad_fixed_t *pcm, | 883 | void synth_full_odd_sbsample (mad_fixed_t *pcm, |
884 | mad_fixed_t (*fo)[8], | 884 | mad_fixed_t (*fo)[8], |
885 | mad_fixed_t (*fe)[8], | 885 | mad_fixed_t (*fe)[8], |
886 | mad_fixed_t const (*D0ptr)[32], | 886 | mad_fixed_t const (*D0ptr)[32], |
887 | mad_fixed_t const (*D1ptr)[32]); | 887 | mad_fixed_t const (*D1ptr)[32]); |
888 | void synth_full_even_band(mad_fixed_t *pcm, | 888 | void synth_full_even_sbsample(mad_fixed_t *pcm, |
889 | mad_fixed_t (*fo)[8], | 889 | mad_fixed_t (*fo)[8], |
890 | mad_fixed_t (*fe)[8], | 890 | mad_fixed_t (*fe)[8], |
891 | mad_fixed_t const (*D0ptr)[32], | 891 | mad_fixed_t const (*D0ptr)[32], |
892 | mad_fixed_t const (*D1ptr)[32]); | 892 | mad_fixed_t const (*D1ptr)[32]); |
893 | 893 | ||
894 | static | 894 | static |
895 | void synth_full(struct mad_synth *synth, struct mad_frame const *frame, | 895 | void synth_full(struct mad_synth *synth, struct mad_frame const *frame, |
@@ -937,7 +937,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame, | |||
937 | pcm[0] = SHIFT(MLZ(hi, lo)); | 937 | pcm[0] = SHIFT(MLZ(hi, lo)); |
938 | pcm += 16; | 938 | pcm += 16; |
939 | 939 | ||
940 | synth_full_odd_band(pcm, fo, fe, D0ptr, D1ptr); | 940 | synth_full_odd_sbsample(pcm, fo, fe, D0ptr, D1ptr); |
941 | D0ptr += 15; | 941 | D0ptr += 15; |
942 | D1ptr += 15; | 942 | D1ptr += 15; |
943 | fo += 15; | 943 | fo += 15; |
@@ -956,7 +956,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame, | |||
956 | pcm[0] = SHIFT(MLZ(hi, lo)); | 956 | pcm[0] = SHIFT(MLZ(hi, lo)); |
957 | pcm += 16; | 957 | pcm += 16; |
958 | 958 | ||
959 | synth_full_even_band(pcm, fo, fe, D0ptr, D1ptr); | 959 | synth_full_even_sbsample(pcm, fo, fe, D0ptr, D1ptr); |
960 | D0ptr += 15; | 960 | D0ptr += 15; |
961 | D1ptr += 15; | 961 | D1ptr += 15; |
962 | fo += 15; | 962 | fo += 15; |
diff --git a/apps/codecs/libmad/synth_full_arm.S b/apps/codecs/libmad/synth_full_arm.S index c5848d3327..e663b8ffcb 100644 --- a/apps/codecs/libmad/synth_full_arm.S +++ b/apps/codecs/libmad/synth_full_arm.S | |||
@@ -23,15 +23,15 @@ | |||
23 | 23 | ||
24 | .section ICODE_SECTION_MPA_ARM,"ax",%progbits | 24 | .section ICODE_SECTION_MPA_ARM,"ax",%progbits |
25 | 25 | ||
26 | .global synth_full_odd_band | 26 | .global synth_full_odd_sbsample |
27 | .global synth_full_even_band | 27 | .global synth_full_even_sbsample |
28 | 28 | ||
29 | ;; r0 = pcm | 29 | ;; r0 = pcm |
30 | ;; r1 = fo | 30 | ;; r1 = fo |
31 | ;; r2 = fe | 31 | ;; r2 = fe |
32 | ;; r3 = D0ptr | 32 | ;; r3 = D0ptr |
33 | ;; r4 = D1ptr | 33 | ;; r4 = D1ptr |
34 | synth_full_odd_band: | 34 | synth_full_odd_sbsample: |
35 | stmdb sp!, {r4-r11, lr} | 35 | stmdb sp!, {r4-r11, lr} |
36 | ldr r4, [sp, #36] | 36 | ldr r4, [sp, #36] |
37 | ldr r5, =synth_full_sp | 37 | ldr r5, =synth_full_sp |
@@ -137,7 +137,7 @@ synth_full_odd_band: | |||
137 | ldr sp, [r5] | 137 | ldr sp, [r5] |
138 | ldmia sp!, {r4-r11, pc} | 138 | ldmia sp!, {r4-r11, pc} |
139 | 139 | ||
140 | synth_full_even_band: | 140 | synth_full_even_sbsample: |
141 | stmdb sp!, {r4-r11, lr} | 141 | stmdb sp!, {r4-r11, lr} |
142 | ldr r4, [sp, #36] | 142 | ldr r4, [sp, #36] |
143 | ldr r5, =synth_full_sp | 143 | ldr r5, =synth_full_sp |