From c6c455e11a61da2f845ce67cfe44ceffd65626b9 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tmatth@videolan.org> Date: Thu, 16 Jan 2025 19:53:30 -0500 Subject: [PATCH 1/2] generate-samples: generate ultra-wideband samples --- src/generate-samples.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/generate-samples.sh b/src/generate-samples.sh index dca92fa7..00b5caa1 100755 --- a/src/generate-samples.sh +++ b/src/generate-samples.sh @@ -6,6 +6,7 @@ set -u MALE_SAMPLE=male.wav FEMALE_SAMPLE=female.wav WB_MALE_SAMPLE=wb_male.wav +UWB_MALE_SAMPLE=uwb_male.wav OUTPUT_DIR=samples mkdir -p ${OUTPUT_DIR} @@ -14,6 +15,9 @@ for sample in $samples; do wget --no-clobber https://www.speex.org/samples/audio/${sample} done +# FIXME: move to speex.org +wget --no-clobber https://people.xiph.org/~tterribe/speex/${UWB_MALE_SAMPLE} + bitrates="4 8 11 15" for b in $bitrates; do kbitrate=$(expr $b \* 1000) @@ -29,3 +33,10 @@ for b in $bitrates; do ./speexenc --wideband --bitrate ${kbitrate} ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}.spx ./speexenc --wideband --bitrate ${kbitrate} --vbr ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}_vbr.spx done + +bitrates="10 12 17 18 21 28" +for b in $bitrates; do + kbitrate=$(expr $b \* 1000) + ./speexenc --ultra-wideband --bitrate ${kbitrate} ${UWB_MALE_SAMPLE} ${OUTPUT_DIR}/uwb_male_speex_${b}.spx + ./speexenc --ultra-wideband --bitrate ${kbitrate} --vbr ${UWB_MALE_SAMPLE} ${OUTPUT_DIR}/uwb_male_speex_${b}_vbr.spx +done -- GitLab From 8cf27eadb5a8eabf3b3e93e7dde2f20092119c36 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tmatth@videolan.org> Date: Thu, 16 Jan 2025 20:29:33 -0500 Subject: [PATCH 2/2] generate-samples: cleanup whitespace --- src/generate-samples.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generate-samples.sh b/src/generate-samples.sh index 00b5caa1..0a1453ee 100755 --- a/src/generate-samples.sh +++ b/src/generate-samples.sh @@ -21,7 +21,7 @@ wget --no-clobber https://people.xiph.org/~tterribe/speex/${UWB_MALE_SAMPLE} bitrates="4 8 11 15" for b in $bitrates; do kbitrate=$(expr $b \* 1000) - ./speexenc --narrowband --bitrate ${kbitrate} ${MALE_SAMPLE} ${OUTPUT_DIR}/male_speex_${b}.spx + ./speexenc --narrowband --bitrate ${kbitrate} ${MALE_SAMPLE} ${OUTPUT_DIR}/male_speex_${b}.spx ./speexenc --narrowband --bitrate ${kbitrate} --vbr ${MALE_SAMPLE} ${OUTPUT_DIR}/male_speex_${b}_vbr.spx ./speexenc --narrowband --bitrate ${kbitrate} ${FEMALE_SAMPLE} ${OUTPUT_DIR}/female_speex_${b}.spx ./speexenc --narrowband --bitrate ${kbitrate} --vbr ${FEMALE_SAMPLE} ${OUTPUT_DIR}/female_speex_${b}_vbr.spx @@ -30,8 +30,8 @@ done bitrates="10 12 17 18 21 28" for b in $bitrates; do kbitrate=$(expr $b \* 1000) - ./speexenc --wideband --bitrate ${kbitrate} ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}.spx - ./speexenc --wideband --bitrate ${kbitrate} --vbr ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}_vbr.spx + ./speexenc --wideband --bitrate ${kbitrate} ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}.spx + ./speexenc --wideband --bitrate ${kbitrate} --vbr ${WB_MALE_SAMPLE} ${OUTPUT_DIR}/wb_male_speex_${b}_vbr.spx done bitrates="10 12 17 18 21 28" -- GitLab