Merge branch 'main' into VA_basop_no_glob_hi_level (8cd44221) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ variables:
		SCRIPTS_DIR: "/usr/local/scripts"
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1
		LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/test_param_file_ltv.py tests/renderer"
		LONG_TEST_SUITE: "tests/test_param_file_ltv.py tests/renderer"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		USE_REF_ENC: "1"
		TEST_SUITE: ""
		@@ -100,7 +100,7 @@ stages:
		# create short test vectors
		- python3 tests/create_short_testvectors.py
		# create references
		- python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref -n auto
		- python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref --create_ref -n auto
		- python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref_part2 -n auto


		@@ -197,9 +197,9 @@ stages:
		# timeout of 15 min per individual testcase - hopefully too much, but better be safe for now
		- testcase_timeout=900
		- if [ $USE_REF_ENC -eq 1 ]; then
		- python3 -m pytest $TEST_SUITE -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path ./IVAS_cod_ref -n auto --testcase_timeout $testcase_timeout \|\| exit_code=$?
		- python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path ./IVAS_cod_ref -n auto --testcase_timeout $testcase_timeout \|\| exit_code=$?
		- else
		- python3 -m pytest $TEST_SUITE -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld -n auto --testcase_timeout $testcase_timeout \|\| exit_code=$?
		- python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld -n auto --testcase_timeout $testcase_timeout \|\| exit_code=$?
		- fi
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

apps/encoder.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -414,13 +414,12 @@ int main(
		/------------------------------------------------------------------------------------------
		* Open input audio file
		------------------------------------------------------------------------------------------/
		short isInputRawFile;
		if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &isInputRawFile ) != IVAS_ERR_OK )

		if ( AudioFileReader_open( &audioReader, arg.inputWavFilename ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );
		goto cleanup;
		}
		set_raw_file_flag( hIvasEnc, isInputRawFile );

		/* Validate input sampling rate */
		int32_t inFileSampleRate = 0;

apps/renderer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -780,8 +780,8 @@ int main(
		exit( -1 );
		}
		}
		short ignore;
		if ( AudioFileReader_open( &audioReader, audioFilePath, &ignore ) != IVAS_ERR_OK )

		if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", audioFilePath );
		exit( -1 );

lib_com/bitstream_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -665,7 +665,7 @@ void write_indices_fx(
		-------------------------------------------------------------------/

		void write_indices_buf_fx(
		Encoder_State_fx st_fx, / i/o: encoder state structure */
		Encoder_State st_fx, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		UWord16 out_buf, / i : output bitstream buf */
		UWord8 pFrame, / i: byte array with bit packet and byte aligned coded speech data */
		@@ -726,7 +726,7 @@ void write_indices_buf_fx(
		{
		/* Create and write ToC header */
		/* qbit always set to 1 on encoder side for AMRWBIO , no qbit in use for EVS, but set to 0(bad) */
		header = (UWord8) ( st_fx->Opt_AMR_WB_fx << 5 \| st_fx->Opt_AMR_WB_fx << 4 \| rate2EVSmode( hBstr->nb_bits_tot_fx * 50, &isAmrWb ) );
		header = (UWord8) ( st_fx->Opt_AMR_WB << 5 \| st_fx->Opt_AMR_WB << 4 \| rate2EVSmode( hBstr->nb_bits_tot_fx * 50, &isAmrWb ) );
		// fwrite(&header, sizeof(UWord8), 1, file);
		memcpy( out_buf, &header, sizeof( UWord8 ) );
		*num_bits += sizeof( UWord8 );

lib_com/cldfb_evs.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1183,7 +1183,7 @@ AnalysisPostSpectrumScaling_Fx (HANDLE_CLDFB_FILTER_BANK cldfbBank, /*!< Handle
		--------------------------------------------------------------------/

		void analysisCldfbEncoder_fx(
		Encoder_State_fx st_fx, / i/o: encoder state structure */
		Encoder_State st_fx, / i/o: encoder state structure */
		const Word16 *timeIn,
		Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
		Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
		@@ -1213,7 +1213,7 @@ void analysisCldfbEncoder_fx(

		/* perform analysis */
		cldfbAnalysisFiltering (
		st_fx->cldfbAna_Fx,
		st_fx->cldfbAnaEnc,
		ppBuf_Real,
		ppBuf_Imag,
		scale,
		@@ -1228,7 +1228,7 @@ void analysisCldfbEncoder_fx(

		/* get 16bit respresentation */
		AnalysisPostSpectrumScaling_Fx (
		st_fx->cldfbAna_Fx,
		st_fx->cldfbAnaEnc,
		ppBuf_Real,
		ppBuf_Imag,
		ppBuf_Real16,
		@@ -1243,8 +1243,8 @@ void analysisCldfbEncoder_fx(
		ppBuf_Real16,
		ppBuf_Imag16,
		enerScale.lb_scale16,
		st_fx->cldfbAna_Fx->no_channels,
		st_fx->cldfbAna_Fx->no_col,
		st_fx->cldfbAnaEnc->no_channels,
		st_fx->cldfbAnaEnc->no_col,
		&st_fx->currEnergyHF_fx,
		&st_fx->currEnergyHF_e_fx,
		enerBuffSum,