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) | |
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, : "r0", "r1", "r2", "r3", "r4"); \ }) -void synth_full_odd_band (mad_fixed_t *pcm, - mad_fixed_t (*fo)[8], - mad_fixed_t (*fe)[8], - mad_fixed_t const (*D0ptr)[32], - mad_fixed_t const (*D1ptr)[32]); -void synth_full_even_band(mad_fixed_t *pcm, - mad_fixed_t (*fo)[8], - mad_fixed_t (*fe)[8], - mad_fixed_t const (*D0ptr)[32], - mad_fixed_t const (*D1ptr)[32]); +void synth_full_odd_sbsample (mad_fixed_t *pcm, + mad_fixed_t (*fo)[8], + mad_fixed_t (*fe)[8], + mad_fixed_t const (*D0ptr)[32], + mad_fixed_t const (*D1ptr)[32]); +void synth_full_even_sbsample(mad_fixed_t *pcm, + mad_fixed_t (*fo)[8], + mad_fixed_t (*fe)[8], + mad_fixed_t const (*D0ptr)[32], + mad_fixed_t const (*D1ptr)[32]); static 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, pcm[0] = SHIFT(MLZ(hi, lo)); pcm += 16; - synth_full_odd_band(pcm, fo, fe, D0ptr, D1ptr); + synth_full_odd_sbsample(pcm, fo, fe, D0ptr, D1ptr); D0ptr += 15; D1ptr += 15; fo += 15; @@ -956,7 +956,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame, pcm[0] = SHIFT(MLZ(hi, lo)); pcm += 16; - synth_full_even_band(pcm, fo, fe, D0ptr, D1ptr); + synth_full_even_sbsample(pcm, fo, fe, D0ptr, D1ptr); D0ptr += 15; D1ptr += 15; 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 @@ .section ICODE_SECTION_MPA_ARM,"ax",%progbits - .global synth_full_odd_band - .global synth_full_even_band + .global synth_full_odd_sbsample + .global synth_full_even_sbsample ;; r0 = pcm ;; r1 = fo ;; r2 = fe ;; r3 = D0ptr ;; r4 = D1ptr -synth_full_odd_band: +synth_full_odd_sbsample: stmdb sp!, {r4-r11, lr} ldr r4, [sp, #36] ldr r5, =synth_full_sp @@ -137,7 +137,7 @@ synth_full_odd_band: ldr sp, [r5] ldmia sp!, {r4-r11, pc} -synth_full_even_band: +synth_full_even_sbsample: stmdb sp!, {r4-r11, lr} ldr r4, [sp, #36] ldr r5, =synth_full_sp |