Commit af03fd99 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 529-bandwidth-detector-not-working-reliably-for-music-and-generic-audio-2
parents 6cc39710 edfab72e

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  SANITIZER_TESTS: "CLANG1 CLANG2"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1

apps/decoder.c

+19 −128

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −29

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+25 −182

File changed.

Preview size limit exceeded, changes collapsed.

ci/smoke_test.sh

+2 −2
Original line number Diff line number Diff line
@@ -93,11 +93,11 @@ modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v I 
echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"

./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt

echo "\n======================= 5. JBM, modes with EXT =======================\n\n"

./scripts/runIvasCodec.py -m $modes_with_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM mono stereo FOA HOA3 5_1 7_1_4 | tee -a smoke_test_output_jbm_noEXT.txt

./scripts/runIvasCodec.py -m $modes_with_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 | tee -a smoke_test_output_jbm_noEXT.txt



# run all modes with binaural output using external files

modes_with_bin_out="SBA PlanarSBA MASA MC ISM1 ISM2 ISM3 ISM4"

bin_out_modes="BINAURAL BINAURAL_ROOM"

bin_out_modes="BINAURAL BINAURAL_ROOM_IR"



echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"

wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_)