Merge branch 'main' into 744_step1_scripts_and_brir_fix (28b466f7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+15 −13

Original line number	Diff line number	Diff line
		@@ -995,8 +995,9 @@ check-first-frame-is-sid:
		- exit_code_foa=0

		# run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding
		- ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -vE "FOA\|HOA" )
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo \|\| exit_code_no_sba=$?
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo $ism_md_cmd \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -E "HOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo \|\| exit_code_hoa=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		@@ -1567,6 +1568,17 @@ sanitizer-test-osba-hoa3-ism2:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-omasa-ism4:
		extends: .sanitizer-test-schedule-B
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 97.5 hours
		timeout: 10 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS


		### --- sanitizer schedule C ---

		@@ -1603,22 +1615,12 @@ sanitizer-test-omasa-ism3:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-omasa-ism4:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 30 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-osba-hoa3-ism3:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 40 hours
		start_in: 30 hours
		timeout: 7.5 hours
		script:
		- *update-ltv-repo
		@@ -1629,7 +1631,7 @@ sanitizer-test-osba-hoa3-ism4:
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 47.5 hours
		start_in: 37.5 hours
		timeout: 7.5 hours
		script:
		- *update-ltv-repo

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2875,7 +2875,7 @@ static void parseOption(
		assert( numOptionValues == 1 );
		if ( !parseRenderFramesize( optionValues[0], &args->render_framesize ) )
		{
		fprintf( stderr, "Unknown or invalid option for LFE position: %s\n", optionValues[0] );
		fprintf( stderr, "Unknown or invalid option for frame size: %s\n", optionValues[0] );
		exit( -1 );
		}

ci/run_scheduled_sanitizer_test.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,8 @@ def get_modes(in_format: str) -> list:
		def get_md_file_command(in_format: str) -> list:

		cmd = list()
		if in_format.startswith("ISM"):
		cmd.append("--metadata_files")
		if "ISM" in in_format:
		cmd.append("--ism_metadata_files")
		md_filename = "/usr/local/ltv/ltvISM{}.csv"
		n = int(in_format[-1])
		cmd.extend([md_filename.format(i) for i in range(1, n + 1)])

ci/smoke_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ fi

		cfg=./scripts/config/ci_linux.json
		dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
		ism_md_cmd="--metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		duration_arg="-U 1:2"
		verbosity_cmd="-z console"

lib_com/ivas_prot.h

+37 −7

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ void stereo_dmx_evs_close_encoder(

		ivas_error ivas_dec(
		Decoder_Struct st_ivas, / i : IVAS decoder structure */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#if( defined SPLIT_REND_WITH_HEAD_ROT && !defined NONBE_UNIFIED_DECODING_PATHS_FIX )
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		@@ -1155,7 +1155,11 @@ int16_t ivas_ism_dtx_enc(
		int16_t sid_flag / o : indication of SID frame */
		);

		#ifdef NONBE_FIX_898_ISM_BRATE_CRASH
		void ivas_ism_dtx_dec(
		#else
		ivas_error ivas_ism_dtx_dec(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		int16_t nb_bits_metadata / o : number of metadata bits */
		);
		@@ -3733,13 +3737,14 @@ void ivas_dirac_dec_set_md_map(
		const int16_t nCldfbTs /* i : number of CLDFB time slots */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		void ivas_dirac_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: synthesized core-coder transport channels/DirAC output */
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t num_subframes /* i : number of subframes to render */
		);

		#endif
		void ivas_dirac_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const int16_t nchan_transport, /* i : number of transport channels */
		@@ -3821,11 +3826,12 @@ void ivas_mc_paramupmix_enc_close(
		const int32_t input_Fs /* i : input sampling rate */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		void ivas_mc_paramupmix_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#endif
		ivas_error ivas_mc_paramupmix_dec_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		@@ -4185,12 +4191,13 @@ void ivas_spar_config(
		const int16_t sid_format /* i : IVAS format indicator from SID frame */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		ivas_error ivas_sba_upmixer_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder struct */
		float output[], / i/o: transport/output audio channels */
		const int16_t output_frame /* i : output frame length */
		);

		#endif
		ivas_error ivas_sba_linear_renderer(
		float output_f[], / i/o: synthesized core-coder transport channels/DirAC output */
		const int16_t output_frame, /* i : output frame length per channel */
		@@ -5303,12 +5310,13 @@ void ivas_ism_renderer_close(
		ISM_RENDERER_HANDLE hIsmRendererData / i/o: ISM renderer handle */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS
		void ivas_ism_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: core-coder transport channels/object output */
		const int16_t output_frame /* i : output frame length per channel */
		);

		#endif
		void ivas_ism_render_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: core-coder transport channels/object output */
		@@ -5341,6 +5349,7 @@ void ivas_param_mc_mc2sba_cldfb(
		const float gain_lfe /* i : gain applied to LFE */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		void ivas_ism2sba(
		float buffer_td[], / i/o: TD signal buffers */
		ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
		@@ -5350,6 +5359,7 @@ void ivas_ism2sba(
		const int16_t sba_order /* i : SBA order */
		);

		#endif
		void ivas_ism2sba_sf(
		float buffer_in[], / i : TC buffer */
		float buffer_out[], / o : TD signal buffers */
		@@ -5698,11 +5708,13 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		float output_f[] / o : rendered time signal */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		ivas_error ivas_osba_dirac_td_binaural(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[], / o : output synthesis signal */
		const int16_t output_frame /* i : output frame length per channel */
		);
		#endif

		ivas_error ivas_osba_ism_metadata_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		@@ -5711,11 +5723,21 @@ ivas_error ivas_osba_ism_metadata_dec(
		int16_t nb_bits_metadata[] /* o : number of ISM metadata bits */
		);

		#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX
		ivas_error ivas_osba_render_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		uint16_t nSamplesAvailableNext, / o : number of CLDFB slots still to render */
		float output_f[] / o : rendered time signal */
		);
		#else
		ivas_error ivas_osba_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: core-coder transport channels/object output */
		const int16_t output_frame /* i : output frame length per channel */
		);
		#endif

		void ivas_osba_data_close(
		SBA_ISM_DATA_HANDLE hSbaIsmData / i/o: OSBA rendering handle */
		@@ -5854,12 +5876,13 @@ ivas_error ivas_omasa_ism_metadata_dec(
		int16_t nb_bits_metadata[] /* o : number of ISM metadata bits */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS
		ivas_error ivas_omasa_dirac_td_binaural(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[], / o : output synthesis signal */
		const int16_t output_frame /* i : output frame length per channel */
		);

		#endif
		ivas_error ivas_omasa_dirac_td_binaural_jbm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		@@ -5869,12 +5892,14 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm(
		float output_f[] / o : rendered time signal */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		void ivas_omasa_dirac_rend(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[], / o : output synthesis signal */
		const int16_t output_frame /* i : output frame length per channel */
		);

		#endif
		void ivas_omasa_rearrange_channels(
		float output[], / o : output synthesis signal */
		const int16_t nchan_transport_ism, /* i : number of ISM TCs */
		@@ -5906,6 +5931,7 @@ void ivas_omasa_separate_object_renderer_close(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		#ifndef NONBE_UNIFIED_DECODING_PATHS_FIX
		void ivas_omasa_separate_object_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float input_f[][L_FRAME48k], /* i : separated object signal */
		@@ -5913,9 +5939,13 @@ void ivas_omasa_separate_object_render(
		const int16_t output_frame /* i : output frame length per channel */
		);

		#endif
		void ivas_omasa_separate_object_render_jbm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesRendered, /* i : number of samples rendered */
		#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX
		float input_f[][L_FRAME48k], /* i : separated object signal */
		#endif
		float output_f[], / o : rendered time signal */
		const int16_t subframes_rendered, /* i : number of subframes rendered */
		const int16_t slots_rendered /* i : number of CLDFB slots rendered */