Skip to content

Commit 9a79389

Browse files
ekurdybxekurdybx
committed
fix: tests: SRC tests catch aplay warnings and refactor
Catch aplay incorrect sample rate warnings and refactor tests Signed-off-by: Emilia Kurdybelska <emiliax.kurdybelska@intel.com>
1 parent 17253b3 commit 9a79389

File tree

5 files changed

+103
-56
lines changed

5 files changed

+103
-56
lines changed

‎case-lib/lib.sh‎

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,6 +1534,18 @@ restore_topology() {
15341534
check_topology
15351535
}
15361536

1537+
# Check aplay output for warnings about incorrect sample rate
1538+
# Arguments: 1-aplay output
1539+
check_for_aplay_warnings()
1540+
{
1541+
dlogi "$1"
1542+
if echo "$1" | grep -q "Warning: rate is not accurate"; then
1543+
dlogw "Caught 'rate not accurate error!'"
1544+
return 1
1545+
fi
1546+
return 0
1547+
}
1548+
15371549
# Play sound and record it
15381550
# Arguments: 1-arecord options 2-aplay options
15391551
play_and_record()
@@ -1542,39 +1554,51 @@ play_and_record()
15421554
# shellcheck disable=SC2086
15431555
arecord $SOF_ALSA_OPTS $SOF_ARECORD_OPTS $1 & PID=$!
15441556
# shellcheck disable=SC2086
1545-
aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS $2
1557+
aplay_output=$(aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS $2 2>&1 | tee /dev/tty)
15461558
wait $PID
15471559
sleep 1
1560+
1561+
check_for_aplay_warnings "$aplay_output"
1562+
return $?
15481563
}
15491564

1550-
# Analyze files to look for glitches.
1565+
# Analyze file to look for glitches.
15511566
# Returns exit code 0 if there are no glitches, 1 if there are.
1552-
# Arguments: the list of filenames
1567+
# Arguments: filename
15531568
check_soundfile_for_glitches()
15541569
{
1555-
glitched_files=0
1556-
# shellcheck disable=SC2154
1570+
if [ -f "$result_filename" ]; then
1571+
dlogi "Analyzing $result_filename file..."
1572+
if python3 "$SCRIPT_HOME"/tools/analyze-wav.py "$result_filename"; then
1573+
dlogi "$result_filename file is correct"
1574+
else
1575+
dlogw "GLITCHED FILE: $result_filename"
1576+
return 1
1577+
fi
1578+
else
1579+
dlogw "MISSING FILE: $result_filename"
1580+
return 1
1581+
fi
1582+
}
1583+
1584+
# Check list of soundfiles for glitches
1585+
# Returns exit code 0 if there are no glitches, 1 if there are.
1586+
# Arguments: list of filenames
1587+
check_soundfiles_for_glitches()
1588+
{
1589+
failures=0
15571590
for result_filename in "${all_result_files[@]}"
15581591
do
1559-
if [ -f "$result_filename" ]; then
1560-
dlogi "Analyzing $result_filename file..."
1561-
if python3 "$SCRIPT_HOME"/tools/analyze-wav.py "$result_filename"; then
1562-
dlogi "$result_filename file is correct"
1563-
else
1564-
dlogw "Found issues in $result_filename file"
1565-
glitched_files=$((glitched_files+1))
1566-
fi
1567-
else
1568-
dlogw "$result_filename file not found, check for previous errors"
1569-
glitched_files=$((glitched_files+1))
1592+
if ! check_soundfile_for_glitches "$result_filename"; then
1593+
failures=$((failures+1))
15701594
fi
15711595
done
15721596

1573-
if [ $glitched_files -eq 0 ]; then
1574-
dlogi "Analysis finished, no issues found"
1597+
if [ "$failures" = 0 ]; then
1598+
dlogi "All files correct"
15751599
return 0
15761600
else
1577-
dlogi "$glitched_files files corrupted"
1601+
dlogw "Found $failures corrupted files"
15781602
return 1
15791603
fi
15801604
}

‎test-case/check-8bit-play-rec.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
3131
OPT_NAME['t']='tplg' OPT_DESC['t']='tplg file, default value is env TPLG: $''TPLG'
3232
OPT_HAS_ARG['t']=1 OPT_VAL['t']="$TPLG"
3333

34-
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Example: hw:0,1'
35-
OPT_HAS_ARG['p']=1 OPT_VAL['p']=''
34+
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Default: hw:0,0'
35+
OPT_HAS_ARG['p']=1 OPT_VAL['p']='hw:0,0'
3636

37-
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Example: hw:0,1'
38-
OPT_HAS_ARG['c']=1 OPT_VAL['c']=''
37+
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Default: hw:0,0'
38+
OPT_HAS_ARG['c']=1 OPT_VAL['c']='hw:0,0'
3939

4040
OPT_NAME['s']='sof-logger' OPT_DESC['s']="Open sof-logger trace the data will store at $LOG_ROOT"
4141
OPT_HAS_ARG['s']=0 OPT_VAL['s']=1
@@ -100,7 +100,7 @@ run_tests()
100100
sox --encoding u-law -r 48000 -c 2 tmp2.raw "$mulaw_rec_filename"
101101
set -e
102102

103-
if check_soundfile_for_glitches "${all_result_files[@]}"; then
103+
if check_soundfiles_for_glitches "${all_result_files[@]}"; then
104104
dlogi "All files correct"
105105
else
106106
die "Detected corrupted files!"

‎test-case/check-float-play-rec.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
3131
OPT_NAME['t']='tplg' OPT_DESC['t']='tplg file, default value is env TPLG: $''TPLG'
3232
OPT_HAS_ARG['t']=1 OPT_VAL['t']="$TPLG"
3333

34-
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Example: hw:0,1'
35-
OPT_HAS_ARG['p']=1 OPT_VAL['p']=''
34+
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Default: hw:0,0'
35+
OPT_HAS_ARG['p']=1 OPT_VAL['p']='hw:0,0'
3636

37-
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Example: hw:0,1'
38-
OPT_HAS_ARG['c']=1 OPT_VAL['c']=''
37+
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Default: hw:0,0'
38+
OPT_HAS_ARG['c']=1 OPT_VAL['c']='hw:0,0'
3939

4040
OPT_NAME['s']='sof-logger' OPT_DESC['s']="Open sof-logger trace the data will store at $LOG_ROOT"
4141
OPT_HAS_ARG['s']=0 OPT_VAL['s']=1
@@ -75,7 +75,7 @@ run_tests()
7575
play_and_record "-D$capture_dev $rec_opt -f FLOAT_LE $rec_filename" "-D$playback_dev $chirp_s32_filename"
7676
set -e
7777

78-
if check_soundfile_for_glitches "${all_result_files[@]}"; then
78+
if check_soundfiles_for_glitches "${all_result_files[@]}"; then
7979
dlogi "All files correct"
8080
else
8181
die "Detected corrupted files!"

‎test-case/check-src-play.sh‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
3131
OPT_NAME['t']='tplg' OPT_DESC['t']='tplg file, default value is env TPLG: $''TPLG'
3232
OPT_HAS_ARG['t']=1 OPT_VAL['t']="$TPLG"
3333

34-
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Example: hw:0,1'
35-
OPT_HAS_ARG['p']=1 OPT_VAL['p']=''
34+
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Default: hw:0,2'
35+
OPT_HAS_ARG['p']=1 OPT_VAL['p']='hw:0,2'
3636

37-
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Example: hw:0,1'
38-
OPT_HAS_ARG['c']=1 OPT_VAL['c']=''
37+
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Default: hw:0,2'
38+
OPT_HAS_ARG['c']=1 OPT_VAL['c']='hw:0,2'
3939

4040
OPT_NAME['s']='sof-logger' OPT_DESC['s']="Open sof-logger trace the data will store at $LOG_ROOT"
4141
OPT_HAS_ARG['s']=0 OPT_VAL['s']=1
@@ -55,29 +55,49 @@ init_globals()
5555
all_result_files=()
5656
}
5757

58+
prepare_test_soundfile()
59+
{
60+
dlogi "Generating test audio: sample rate: $sample_rate Hz, chirp rate: $chirp_rate Hz..."
61+
mkdir -p "$HOME/Music"
62+
test_sound_filename="$HOME/Music/${sample_rate}_Hz.wav"
63+
ffmpeg -loglevel error -y -f lavfi -i "aevalsrc='sin($chirp_rate*t*2*PI*t)':s=$sample_rate:d=5" -ac 2 "$test_sound_filename"
64+
}
65+
5866
run_tests()
5967
{
60-
set +e
68+
errors=0
69+
whole_test_pass=true
70+
6171
for i in "${!sample_rates[@]}"
6272
do
73+
test_pass=true
6374
sample_rate=${sample_rates[$i]}
6475
chirp_rate=${chirp_rates[$i]}
76+
dlogi "--------------- TEST $((i+1)): SAMPLE RATE $sample_rate Hz, CHIRP RATE $chirp_rate Hz ---------------"
6577

66-
test_sound_filename=$LOG_ROOT/play.wav
6778
result_filename=$LOG_ROOT/rec_play_$sample_rate.wav
68-
all_result_files+=("$result_filename")
79+
# all_result_files+=("$result_filename")
80+
prepare_test_soundfile
81+
play_and_record "-D$capture_dev $rec_opt $result_filename" "-D$playback_dev $test_sound_filename"
6982

70-
dlogi "Play $sample_rate Hz chirp 0 - $chirp_rate Hz, capture as 48 kHz"
71-
ffmpeg -y -f lavfi -i "aevalsrc='sin($chirp_rate*t*2*PI*t)':s=$sample_rate:d=5" -ac 2 "$test_sound_filename" #TODO: maybe separate dir for artifacts ??
83+
if [ $? -eq 1 ]; then
84+
test_pass=false
85+
dlogi "TEST $((i+1)) FAIL: Aplay failed, look for previous errors"
86+
fi
7287

73-
play_and_record "-D$capture_dev $rec_opt $result_filename" "-D$playback_dev $test_sound_filename"
88+
check_soundfile_for_glitches "$result_filename"
89+
if [ $? -eq 1 ]; then
90+
test_pass=false
91+
dlogi "TEST $((i+1)) FAIL: Found glitch in the recording"
92+
fi
93+
94+
if [ "$test_pass" = true ]; then
95+
dlogi "TEST $((i+1)) PASS: No issues found."
96+
fi
7497
done
75-
set -e
76-
77-
if check_soundfile_for_glitches "${all_result_files[@]}"; then
78-
dlogi "All files correct"
79-
else
80-
die "Detected corrupted files!"
98+
99+
if [ "$whole_test_pass" = false ]; then
100+
die "FAIL: Not all testcases passed. Look for previous errors."
81101
fi
82102
}
83103

‎test-case/check-src-rec.sh‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
3030
OPT_NAME['t']='tplg' OPT_DESC['t']='tplg file, default value is env TPLG: $''TPLG'
3131
OPT_HAS_ARG['t']=1 OPT_VAL['t']="$TPLG"
3232

33-
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Example: hw:0,1'
34-
OPT_HAS_ARG['p']=1 OPT_VAL['p']=''
33+
OPT_NAME['p']='playback_device' OPT_DESC['p']='ALSA pcm playback device. Default: hw:0,2'
34+
OPT_HAS_ARG['p']=1 OPT_VAL['p']='hw:0,2'
3535

36-
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Example: hw:0,1'
37-
OPT_HAS_ARG['c']=1 OPT_VAL['c']=''
36+
OPT_NAME['c']='capture_device' OPT_DESC['c']='ALSA pcm capture device. Default: hw:0,2'
37+
OPT_HAS_ARG['c']=1 OPT_VAL['c']='hw:0,2'
3838

3939
OPT_NAME['s']='sof-logger' OPT_DESC['s']="Open sof-logger trace the data will store at $LOG_ROOT"
4040
OPT_HAS_ARG['s']=0 OPT_VAL['s']=1
@@ -58,23 +58,26 @@ init_globals()
5858
run_tests()
5959
{
6060
dlogi "Generate 48 kHz chirp 0 - 20 kHz"
61-
ffmpeg -y -f lavfi -i "aevalsrc='sin(2000*t*2*PI*t)':s=48000:d=5" -ac 2 "$test_sound_filename"
61+
ffmpeg -loglevel error -y -f lavfi -i "aevalsrc='sin(2000*t*2*PI*t)':s=48000:d=5" -ac 2 "$test_sound_filename"
6262

63-
set +e
63+
failures=0
6464
for i in "${!sample_rates[@]}"
6565
do
6666
sample_rate=${sample_rates[$i]}
67+
dlogi "--------------- TEST $((i+1)): SAMPLE RATE $sample_rate Hz ---------------"
6768

6869
result_filename=$LOG_ROOT/rec_$sample_rate.wav
69-
all_result_files+=("$result_filename")
7070
play_and_record "-D$capture_dev $rec_opt -r $sample_rate $result_filename" "-D$playback_dev $test_sound_filename"
71+
72+
if ! check_soundfile_for_glitches "$result_filename"; then
73+
failures=$((failures+1))
74+
fis
7175
done
72-
set -e
7376

74-
if check_soundfile_for_glitches "${all_result_files[@]}"; then
75-
dlogi "All files correct"
77+
if [ "$failures" = 0 ]; then
78+
dlogi "PASS: All files correct"
7679
else
77-
die "Detected corrupted files!"
80+
die "FAIL: Found $failures corrupted files"
7881
fi
7982
}
8083

0 commit comments

Comments
 (0)