Merge branch 'main' into 722-memory-leak-in-mc-paramupmix-with-bitrate-switching (ee03f187) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1106,6 +1106,9 @@ test-long-self-test:
		timeout: "50 minutes"
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info
		- *update-ltv-repo
		@@ -1148,6 +1151,7 @@ test-long-self-test:
		- zero_errors=$(cat report-junit-ltv.xml \| grep -c 'errors="0"') \|\| true

		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
		- if [ $exit_code -eq 1 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi
		- exit 0

lib_com/ivas_prot.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -5296,6 +5296,18 @@ void ivas_mc2sba(
		const float gain_lfe /* i : gain for LFE, 0=ignore LFE */
		);

		#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		void ivas_param_mc_mc2sba_cldfb(
		IVAS_OUTPUT_SETUP hTransSetup, /* i : transported MC Format */
		float hoa_encoder, / i : HOA3 encoder for the transported MC format */
		const int16_t slot_idx, /* i : current slot in the subframe */
		float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
		float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
		const int16_t nBands, /* i : number of synth CLDFB bands */
		const float gain_lfe /* i : gain applied to LFE */
		);
		#endif

		void ivas_ism2sba(
		float buffer_td[], / i/o: TD signal buffers */
		ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */

lib_com/ivas_rom_com.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1464,9 +1464,7 @@ const int16_t pr_pd_idx_pairs[3][3][2] = { { { 1, 1 },{ 2, 2 },{ 3, 3 } },{ { 1,
		const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS] = { /* WYZX --> WYXZ... */
		{ 0, 1, 3, 2, 4, 5, 6, 7, 8, 9, 10 }
		};
		#ifdef SPAR_HOA_DBG
		const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1, 1, 1 };
		#endif

		const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15};
		const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10, 10, 10, 10};
		const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};

lib_com/ivas_rom_com.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -180,9 +180,6 @@ extern const ivas_huff_models_t ivas_huff_drct_r_consts[TOTAL_DRCT_QUANT_STRATS]
		extern const ivas_huff_models_t ivas_huff_decd_r_consts[TOTAL_DECD_QUANT_STRATS];
		extern const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN];
		extern const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS];
		#ifdef SPAR_HOA_DBG
		extern const int16_t keep_planar[IVAS_SPAR_MAX_CH - FOA_CHANNELS];
		#endif
		extern const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN];
		extern const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH];
		extern const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH];

lib_com/options.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@
		/#define DEBUG_SPAR_MD_TARGET_TUNING/ /* SPAR MD target bitrate tuning debug code */
		/#define DEBUG_SPAR_BYPASS_EVS_CODEC/ /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */
		/#define DEBUG_SPAR_WRITE_OUT_COV/ /* write covariance per frame into a text file for verification */
		/#define DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS/
		/#define DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS//* Log SPAR Prediction coefficients to a text file for verification */
		/#define DEBUG_AGC/ /* debug SPAR AGC in-out */
		#endif
		/#define SPAR_HOA_DBG/ /* SPAR HOA debug statements */
		@@ -156,6 +156,8 @@
		#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN /* Nokia: Issue 623: Split rendering support for parambin renderer */
		#define FIX_658_SPLIT_REND_MASA /Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode/
		#define OSBA_SPLIT_RENDERING
		#define ROM_TO_RAM /Dlb : ROM optimization in SR mode/
		#define FIX_712_713_SPLIT_REND_MASA_MC /Dlb : Fix for issue 712 and 713/
		#endif

		#define FIX_732_PLANAR_SBA_OSBA /* Dlb : issue 732: fix for crash in planar mode in OSBA format*/
		@@ -183,6 +185,8 @@
		#define NONBE_FIX_770_PLANAR_SBA_JBM /* FhG : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */
		#define NONBE_FIX_760_COHERENCE_MASA /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */
		#define NONBE_FIX_752_OSBA_MISCONFIG_MCT /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/
		#define NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION /* Dlb : issue 727 : headrotation in MC paramupmix mode*/

		#define NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX /* Dlb : issue 722: memory leak fix in MC param upmix mode with BR switching*/
		#define NONBE_FIX_780_ISM_STARTS_WITH_SID /* VA: issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT */
		#define NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */