From b04990f79c3298d68f4a0ca86c3d01091cd204f6 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 2 Jun 2021 13:35:55 +0100 Subject: [PATCH] move mp3 test params slightly higher up so as not to clash with qemu BIOS --- media/audio/mp3/mp3_0.gpr | 8 ++++---- media/audio/mp3/mp3_0.sh | 6 +++--- media/audio/mp3/mp3_1.sh | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/media/audio/mp3/mp3_0.gpr b/media/audio/mp3/mp3_0.gpr index d82ffa5e..7b3a8c42 100644 --- a/media/audio/mp3/mp3_0.gpr +++ b/media/audio/mp3/mp3_0.gpr @@ -2,8 +2,8 @@ # int *dither_state, float *samples, # ptrdiff_t incr); 1: 0x8000 # stack pointer -3: 0x100000 # param 1: float *sunth_buf buf -4: 0x200000 # param 2: float *window win -5: 0x300000 # param 3: int *dither_state &unused -6: 0x400000 # param 3: float *samples out +3: 0x600000 # param 1: float *sunth_buf buf +4: 0x700000 # param 2: float *window win +5: 0x800000 # param 3: int *dither_state &unused +6: 0x900000 # param 3: float *samples out 7: 1 # param 5: ptr_diff_t incr 1 diff --git a/media/audio/mp3/mp3_0.sh b/media/audio/mp3/mp3_0.sh index b90c40cc..4b6847b5 100755 --- a/media/audio/mp3/mp3_0.sh +++ b/media/audio/mp3/mp3_0.sh @@ -3,8 +3,8 @@ pypowersim -g audio/mp3/mp3_0.gpr \ -s common.spr \ -p 0x20000000 \ - -l data/audio/mp3/mp3_0_data/buf${1}:0x100000 \ - -l data/audio/mp3/mp3_0_data/win0:0x200000 \ - -d ${2}:0x400000:128 \ + -l data/audio/mp3/mp3_0_data/buf${1}:0x600000 \ + -l data/audio/mp3/mp3_0_data/win0:0x700000 \ + -d ${2}:0x900000:128 \ -i audio/mp3/mp3_0_apply_window_float.bin cmp ${2} data/audio/mp3/mp3_0_data/samples${1} diff --git a/media/audio/mp3/mp3_1.sh b/media/audio/mp3/mp3_1.sh index 5d0b7ed8..de0eba19 100755 --- a/media/audio/mp3/mp3_1.sh +++ b/media/audio/mp3/mp3_1.sh @@ -3,10 +3,10 @@ pypowersim -g audio/mp3/mp3_1.gpr \ -s common.spr \ -p 0x20000000 \ - -l data/audio/mp3/mp3_1_data/beforeout${1}:0x100000 \ - -l data/audio/mp3/mp3_1_data/buf${1}:0x200000 \ - -l data/audio/mp3/mp3_1_data/in${1}:0x300000 \ - -l data/audio/mp3/mp3_1_data/win${1}:0x400000 \ - -d ${2}:0x100000:9216 \ + -l data/audio/mp3/mp3_1_data/beforeout${1}:0x600000 \ + -l data/audio/mp3/mp3_1_data/buf${1}:0x700000 \ + -l data/audio/mp3/mp3_1_data/in${1}:0x800000 \ + -l data/audio/mp3/mp3_1_data/win${1}:0x900000 \ + -d ${2}:0x600000:9216 \ -i audio/mp3/mp3_1_imdct36_float.bin cmp ${2} data/audio/mp3/mp3_1_data/out${1} -- 2.30.2