Skip to content

Commit 5867b6c

Browse files
authored
Merge pull request #257 from tmoida/main
Audio: Reduce AudioPlayback to 10 configs and fix YAML parameter conflicts
2 parents e08ee3f + 5112843 commit 5867b6c

6 files changed

Lines changed: 218 additions & 167 deletions

File tree

Runner/plans/meta-ar-ci-premerge.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@ run:
1313
steps:
1414
- cd Runner
1515

16-
# ========== AudioPlayback Test Cases (7 configs) ==========
16+
# ========== AudioPlayback Test Cases (5 configs) ==========
1717

18-
# Playback Test 1: Config1 (16KHz, 16-bit, 2ch)
19-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config1" --res-suffix "Config1" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
18+
# Playback Test 1: playback_config1 (8KHz, 8-bit, 1ch)
19+
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "playback_config1" --res-suffix "Config1" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
2020
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config1.res || true
2121

22-
# Playback Test 2: Config7 (24KHz, 24-bit, 6ch)
23-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config7" --res-suffix "Config7" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
24-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config7.res || true
22+
# Playback Test 2: playback_config3 (16KHz, 16-bit, 2ch)
23+
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "playback_config3" --res-suffix "Config3" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
24+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config3.res || true
2525

26-
# Playback Test 3: Config13 (44.1KHz, 16-bit, 1ch)
27-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config13" --res-suffix "Config13" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
28-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config13.res || true
29-
30-
# Playback Test 4: Config15 (48KHz, 8-bit, 2ch)
31-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config15" --res-suffix "Config15" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
32-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config15.res || true
33-
34-
# Playback Test 5: Config18 (88.2KHz, 24-bit, 2ch)
35-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config18" --res-suffix "Config18" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
36-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config18.res || true
26+
# Playback Test 3: playback_config5 (24KHz, 24-bit, 6ch)
27+
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "playback_config5" --res-suffix "Config5" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
28+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config5.res || true
3729

38-
# Playback Test 6: Config20 (96KHz, 24-bit, 6ch)
39-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config20" --res-suffix "Config20" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
40-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config20.res || true
30+
# Playback Test 4: playback_config8 (32KHz, 16-bit, 2ch)
31+
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "playback_config8" --res-suffix "Config8" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
32+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config8.res || true
4133

42-
# Playback Test 7: Config5 (192KHz, 32-bit, 8ch)
43-
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "Config5" --res-suffix "Config5" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
44-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config5.res || true
34+
# Playback Test 5: playback_config10 (48KHz, 8-bit, 2ch)
35+
- $PWD/suites/Multimedia/Audio/AudioPlayback/run.sh --clip-name "playback_config10" --res-suffix "Config10" --audio-clips-path /home/AudioClips/ --no-extract-assets || true
36+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioPlayback/AudioPlayback_Config10.res || true
4537

46-
# ========== AudioRecord Test Cases (3 configs) ==========
38+
# ========== AudioRecord Test Cases (5 configs) ==========
4739

4840
# Record Test 1: record_config1 (8KHz, 1ch)
4941
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config1" --res-suffix "Config1" --record-seconds 10s || true
5042
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config1.res || true
5143

52-
# Record Test 2: record_config7 (48KHz, 2ch)
44+
# Record Test 2: record_config3 (16KHz, 2ch)
45+
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config3" --res-suffix "Config3" --record-seconds 10s || true
46+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config3.res || true
47+
48+
# Record Test 3: record_config5 (32KHz, 2ch)
49+
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config5" --res-suffix "Config5" --record-seconds 10s || true
50+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config5.res || true
51+
52+
# Record Test 4: record_config7 (48KHz, 2ch)
5353
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config7" --res-suffix "Config7" --record-seconds 10s || true
5454
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config7.res || true
5555

56-
# Record Test 3: record_config10 (96KHz, 6ch)
57-
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config10" --res-suffix "Config10" --record-seconds 10s || true
58-
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config10.res || true
56+
# Record Test 5: record_config9 (96KHz, 2ch)
57+
- $PWD/suites/Multimedia/Audio/AudioRecord/run.sh --config-name "record_config9" --res-suffix "Config9" --record-seconds 10s || true
58+
- $PWD/utils/send-to-lava.sh $PWD/suites/Multimedia/Audio/AudioRecord/AudioRecord_Config9.res || true
5959

6060
# Parse and report results
6161
- $PWD/utils/result_parse.sh

Runner/suites/Multimedia/Audio/AudioPlayback/AudioPlayback.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
params:
1111
AUDIO_BACKEND: "" # Selects backend: pipewire or pulseaudio, default: auto-detect
1212
SINK_CHOICE: "speakers" # Playback sink: speakers or null, default: speakers
13-
CLIP_NAMES: "Config1" # Test specific clips (e.g., "Config1 Config2" or "play_48KHz_8b_2ch"), default: Config1
13+
CLIP_NAMES: "playback_config1" # Test specific clips (e.g., "playback_config1 playback_config2" or "play_48KHz_8b_2ch"), default: playback_config1
1414
CLIP_FILTER: "" # Filter clips by pattern (e.g., "48KHz" or "16b" or "2ch"), default: unset
1515
FORMATS: "wav" # Audio formats: e.g. wav, default: wav
1616
DURATIONS: "short" # Playback durations: short, medium, long, default: short
@@ -21,7 +21,7 @@ params:
2121
VERBOSE: 0 # Enable verbose logging, default: 0
2222
EXTRACT_AUDIO_ASSETS: true # Download/extract audio assets if missing, default: true
2323
ENABLE_NETWORK_DOWNLOAD: false # Enable network download of missing audio files, default: false
24-
AUDIO_CLIPS_BASE_DIR: "" # Custom path to pre-staged audio clips (for CI), default: unset
24+
AUDIO_CLIPS_BASE_DIR: "/home/AudioClips" # Custom path to pre-staged audio clips (for CI), default: /home/AudioClips
2525
SSID: "" # Wi-Fi SSID for network connection, default: unset
2626
PASSWORD: "" # Wi-Fi password for network connection, default: unset
2727
NET_PROBE_ROUTE_IP: "1.1.1.1" # IP used for route probing, default: 1.1.1.1
@@ -32,5 +32,5 @@ run:
3232
steps:
3333
- REPO_PATH=$PWD
3434
- cd Runner/suites/Multimedia/Audio/AudioPlayback/
35-
- ./run.sh --backend "${AUDIO_BACKEND}" --sink "${SINK_CHOICE}" --clip-name "${CLIP_NAMES}" --clip-filter "${CLIP_FILTER}" --formats "${FORMATS}" --durations "${DURATIONS}" --loops "${LOOPS}" --timeout "${TIMEOUT}" --strict "${STRICT}" --audio-clips-path "${AUDIO_CLIPS_BASE_DIR}" --res-suffix "${RES_SUFFIX}" --ssid "${SSID}" --password "${PASSWORD}" || true
35+
- ./run.sh --backend "${AUDIO_BACKEND}" --sink "${SINK_CHOICE}" --clip-name "${CLIP_NAMES}" --clip-filter "${CLIP_FILTER}" --loops "${LOOPS}" --timeout "${TIMEOUT}" --strict "${STRICT}" --audio-clips-path "${AUDIO_CLIPS_BASE_DIR}" --res-suffix "${RES_SUFFIX}" --ssid "${SSID}" --password "${PASSWORD}" || true
3636
- $REPO_PATH/Runner/utils/send-to-lava.sh AudioPlayback${RES_SUFFIX:+_${RES_SUFFIX}}.res || true

0 commit comments

Comments
 (0)