Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions .github/workflows/testbench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,27 @@ jobs:
octave octave-signal automake autoconf libtool
gettext libasound2-dev

# Ubuntu 24.04 ships autoconf 2.71, but current alsa-lib/alsa-utils
# require >= 2.72. Build a newer autoconf from the GNU release
# tarball and install it into /usr/local (ahead of /usr/bin in PATH).
- name: Install autoconf 2.72
run: |
cd ${GITHUB_WORKSPACE}
wget -q https://ftp.gnu.org/gnu/autoconf/autoconf-2.72.tar.gz
tar xf autoconf-2.72.tar.gz
cd autoconf-2.72
./configure --prefix=/usr/local
make -j"$(nproc)"
sudo make install
hash -r
autoconf --version | head -n1

- name: Build Alsa-lib
run: |
cd ${GITHUB_WORKSPACE}
git clone https://github.com/thesofproject/alsa-lib.git
cd alsa-lib
git checkout df8f1cc1ec9d9ee15be5e2c23ad25b9389fd8766 -b build
git checkout 08b532cd3da9ac8f683bcb4e4beb9b74c39c1782 -b build
./gitcompile --prefix=${GITHUB_WORKSPACE}/tools
make install

Expand All @@ -63,7 +78,7 @@ jobs:
cd ${GITHUB_WORKSPACE}
git clone https://github.com/thesofproject/alsa-utils.git
cd alsa-utils
git checkout 0ffa105942a06cdfa98e5918b8dc82e3cac12792 -b build
git checkout 9feb22ba45b48729729c8d194aaf1bc082a6842a -b build
./gitcompile --prefix=${GITHUB_WORKSPACE}/tools \
--with-alsa-prefix=${GITHUB_WORKSPACE}/tools \
--with-alsa-inc-prefix=${GITHUB_WORKSPACE}/tools/include \
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-alsa-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ declare -a REPOS=(
# the repository if this commit ID is not found. Leave empty to skip.
# This array order must align with REPO array above.
declare -a COMMIT_ID=(
"df8f1cc1ec9d9ee15be5e2c23ad25b9389fd8766"
"09550cd393b1a7d307ee6f26637b1ed7bd275e38"
"08b532cd3da9ac8f683bcb4e4beb9b74c39c1782"
"9feb22ba45b48729729c8d194aaf1bc082a6842a"
# Add more IDs here...
)

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-benchmark-hda.conf
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ Object.PCM.pcm [
direction "playback"
name $ANALOG_PLAYBACK_PCM
formats 'S32_LE,S24_LE,S16_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
channels_min $BENCH_PCM_CHANNELS_MIN
channels_max $BENCH_PCM_CHANNELS_MAX
}
Object.PCM.pcm_caps.2 {
direction "capture"
name $ANALOG_CAPTURE_PCM
formats 'S32_LE,S24_LE,S16_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
channels_min $BENCH_PCM_CHANNELS_MIN
channels_max $BENCH_PCM_CHANNELS_MAX
}
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-benchmark-sdw.conf
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Object.PCM.pcm [
Object.PCM.pcm_caps.1 {
name $ANALOG_PLAYBACK_PCM
formats 'S16_LE,S24_LE,S32_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
channels_min $BENCH_PCM_CHANNELS_MIN
channels_max $BENCH_PCM_CHANNELS_MAX
}
Expand All @@ -153,7 +153,7 @@ Object.PCM.pcm [
Object.PCM.pcm_caps.1 {
name $ANALOG_CAPTURE_PCM
formats 'S16_LE,S24_LE,S32_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
channels_min $BENCH_PCM_CHANNELS_MIN
channels_max $BENCH_PCM_CHANNELS_MAX
}
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -1698,14 +1698,14 @@ IncludeByKey.PASSTHROUGH {
direction "playback"
name "SSP2 Playback"
formats 'S16_LE,S24_LE,S32_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
}

Object.PCM.pcm_caps.2 {
direction "capture"
name "SSP2 Capture"
formats 'S16_LE,S24_LE,S32_LE'
rates "8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,176400,192000"
rates "8000,11025,16000,22050,24000,32000,44100,48000,64000,88200,96000,176400,192000"
}
}
]
Expand Down
Loading