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>

Author: ekurdybx

case-lib/lib.sh

@@ -1534,6 +1534,18 @@ restore_topology() {
     check_topology
 }
 
+# Check aplay output for warnings about incorrect sample rate
+# Arguments: 1-aplay output
+check_for_aplay_warnings()
+{
+    dlogi "$1"
+    if echo "$1" | grep -q "Warning: rate is not accurate"; then
+        dlogw "Caught 'rate not accurate error!'"
+        return 1
+    fi
+    return 0
+}
+
 # Play sound and record it
 # Arguments: 1-arecord options 2-aplay options
 play_and_record()
@@ -1542,39 +1554,50 @@ play_and_record()
     # shellcheck disable=SC2086
     arecord $SOF_ALSA_OPTS $SOF_ARECORD_OPTS $1 & PID=$!
     # shellcheck disable=SC2086
-    aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS $2
+    aplay_output=$(aplay $SOF_ALSA_OPTS $SOF_APLAY_OPTS $2 2>&1 | tee /dev/tty)
     wait $PID
     sleep 1
+
+    check_for_aplay_warnings "$aplay_output"
+    return $?
 }
 
-# Analyze files to look for glitches.
+# Analyze file to look for glitches.
 # Returns exit code 0 if there are no glitches, 1 if there are.
-# Arguments: the list of filenames
+# Arguments: filename
 check_soundfile_for_glitches()
 {
-    glitched_files=0
-    # shellcheck disable=SC2154
+    if [ -f "$result_filename" ]; then
+        dlogi "Analyzing $result_filename file..."
+        if python3 "$SCRIPT_HOME"/tools/analyze-wav.py "$result_filename"; then
+            dlogi "$result_filename file is correct" 
+        else
+            dlogw "GLITCHED FILE: $result_filename"
+        fi
+    else
+        dlogw "MISSING FILE: $result_filename"
+        return 1
+    fi
+}
+
+# Check list of soundfiles for glitches
+# Returns exit code 0 if there are no glitches, 1 if there are.
+# Arguments: list of filenames
+check_soundfiles_for_glitches()
+{
+    failures=0
     for result_filename in "${all_result_files[@]}"
     do
-        if [ -f "$result_filename" ]; then
-            dlogi "Analyzing $result_filename file..."
-            if python3 "$SCRIPT_HOME"/tools/analyze-wav.py "$result_filename"; then
-                dlogi "$result_filename file is correct" 
-            else
-                dlogw "Found issues in $result_filename file"
-                glitched_files=$((glitched_files+1))
-            fi
-        else
-            dlogw "$result_filename file not found, check for previous errors"
-            glitched_files=$((glitched_files+1))
+        if ! check_soundfile_for_glitches "$result_filename"; then
+            failures=$((failures+1))
         fi
     done
 
-    if [ $glitched_files -eq 0 ]; then
-        dlogi "Analysis finished, no issues found"
+    if [ "$failures" = 0 ]; then
+        dlogi "All files correct"
         return 0
     else
-        dlogi "$glitched_files files corrupted"
+        dlogw "Found $failures corrupted files"
         return 1
     fi
 }

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

@@ -100,7 +100,7 @@ run_tests()
     sox --encoding u-law -r 48000 -c 2 tmp2.raw "$mulaw_rec_filename"
     set -e
 
-    if check_soundfile_for_glitches "${all_result_files[@]}"; then
+    if check_soundfiles_for_glitches "${all_result_files[@]}"; then
         dlogi "All files correct"
     else
         die "Detected corrupted files!"

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

@@ -75,7 +75,7 @@ run_tests()
     play_and_record "-D$capture_dev $rec_opt -f FLOAT_LE $rec_filename" "-D$playback_dev $chirp_s32_filename"
     set -e
 
-    if check_soundfile_for_glitches "${all_result_files[@]}"; then
+    if check_soundfiles_for_glitches "${all_result_files[@]}"; then
         dlogi "All files correct"
     else
         die "Detected corrupted files!"

test-case/check-src-play.sh

@@ -55,29 +55,50 @@ init_globals()
     all_result_files=()
 }
 
+prepare_test_soundfile()
+{
+    dlogi "Generating test audio: sample rate: $sample_rate Hz, chirp rate: $chirp_rate Hz..."
+    mkdir -p "$HOME/Music"
+    test_sound_filename="$HOME/Music/${sample_rate}_Hz.wav"
+    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"
+}
+
 run_tests()
 {
-    set +e
+    errors=0
+    whole_test_pass=true
+    
     for i in "${!sample_rates[@]}"
     do
+        test_pass=true
         sample_rate=${sample_rates[$i]}
         chirp_rate=${chirp_rates[$i]}
+        dlogi "--------------- TEST $((i+1)): SAMPLE RATE $sample_rate Hz, CHIRP RATE $chirp_rate Hz ---------------"
 
-        test_sound_filename=$LOG_ROOT/play.wav
         result_filename=$LOG_ROOT/rec_play_$sample_rate.wav
-        all_result_files+=("$result_filename")
-
-        dlogi "Play $sample_rate Hz chirp 0 - $chirp_rate Hz, capture as 48 kHz"
-        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 ??
-
+        # all_result_files+=("$result_filename")
+        prepare_test_soundfile
         play_and_record "-D$capture_dev $rec_opt $result_filename" "-D$playback_dev $test_sound_filename"
+
+        if [ $? -eq 1 ]; then
+            test_pass=false
+            dlogi "FAIL: Aplay failed, look for previous errors"
+        fi
+
+        check_soundfile_for_glitches "$result_filename"
+        if [ $? -eq 1 ]; then
+            test_pass=false
+            dlogi "FAIL: Found glitch in the recording"
+        fi
+
+        if [ "$test_pass" = true ]; then
+            die "PASS: No issues found."
+        fi
+        dlogi " " # For cleaner logs
     done
-    set -e
-    
-    if check_soundfile_for_glitches "${all_result_files[@]}"; then
-        dlogi "All files correct"
-    else
-        die "Detected corrupted files!"
+
+    if [ "$whole_test_pass" = false ]; then
+        die "FAIL: Not all testcases passed. Look for previous errors."
     fi
 }
 

test-case/check-src-rec.sh

@@ -60,21 +60,24 @@ run_tests()
     dlogi "Generate 48 kHz chirp 0 - 20 kHz"
     ffmpeg -y -f lavfi -i "aevalsrc='sin(2000*t*2*PI*t)':s=48000:d=5" -ac 2 "$test_sound_filename"
 
-    set +e
+    failures=0
     for i in "${!sample_rates[@]}"
     do
         sample_rate=${sample_rates[$i]}
+        dlogi "--------------- TEST $((i+1)): SAMPLE RATE $sample_rate Hz ---------------"
 
         result_filename=$LOG_ROOT/rec_$sample_rate.wav
-        all_result_files+=("$result_filename")
         play_and_record "-D$capture_dev $rec_opt -r $sample_rate $result_filename" "-D$playback_dev $test_sound_filename"
+
+        if ! check_soundfile_for_glitches "$result_filename"; then
+            failures=$((failures+1))
+        fi
     done
-    set -e
 
-    if check_soundfile_for_glitches "${all_result_files[@]}"; then
-        dlogi "All files correct"
+    if [ "$failures" = 0 ]; then
+        dlogi "PASS: All files correct"
     else
-        die "Detected corrupted files!"
+        die "FAIL: Found $failures corrupted files"
     fi
 }