Merge branch... (7d0c8b15) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+27 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,7 @@ build-codec-instrumented-linux:
		extends:
		- .build-job-linux
		- .rules-basis
		timeout: "6 minutes"
		script:
		- *print-common-info
		- bash ci/build_codec_instrumented_linux.sh
		@@ -658,6 +659,32 @@ clang-format-check:
		name: "$ARTIFACT_BASE_NAME"
		expose_as: 'formatting patch'

		# check for crashes if first received frame on decoder side is an SID
		check-first-frame-is-sid:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		tags:
		- ivas-linux
		stage: test
		needs: ["build-codec-linux-cmake"]
		script:
		- *print-common-info
		- *update-ltv-repo
		- cmake .
		- make -j

		# TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA)
		- echo $modes
		- scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500
		artifacts:
		paths:
		- out/logs
		when: on_failure
		name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"
		expose_as: "logs-sidstart"

		# ---------------------------------------------------------------
		# Test jobs for main branch
		# ---------------------------------------------------------------

apps/encoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1489,7 +1489,7 @@ static bool parseCmdlIVAS_enc(
		arg->inputFormatConfig.stereoToMonoDownmix = true;
		i++;
		}
		else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"
		else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // TODO: should be renamed to "-pca"
		{
		i++;
		if ( i < argc - 4 )

apps/renderer.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,11 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_nonDiegeticPan,
		.match = "non_diegetic_pan",
		.matchShort = "ndp",
		#ifdef FIX_TODO_NON_DIEGETIC_PAN_NOT_IMPLELENTED_IN_RENDERER
		.description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n",
		#else
		.description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n(todo: implementation)",
		#endif
		},
		{
		.id = CmdLnOptionId_orientationTracking,
		@@ -987,7 +991,7 @@ int main(
		else
		{
		error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL );
		if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC
		if ( error != IVAS_ERR_OK && error != IVAS_ERR_INVALID_OUTPUT_FORMAT )
		{
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );

lib_com/bits_alloc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -737,7 +737,7 @@ ivas_error config_acelp1(
		}
		else /* L_frame == L_FRAME16k */
		{
		acelp_cfg->lsf_bits = 41; /* TBV: currently LSFQ @16kHz is not flexible (only 31/41 bits supported */
		acelp_cfg->lsf_bits = 41;
		}
		}

		@@ -1360,7 +1360,7 @@ ivas_error config_acelp1(
		acelp_cfg->ubits = acelp_cfg->lsf_bits - 46;
		acelp_cfg->lsf_bits = 46;
		}
		else if ( acelp_cfg->lsf_bits > 42 && L_frame == L_FRAME ) /* TBV: verify maximum supported LSF Q bitbudget (for some reason 43 bits LSFQ decreases segSNR by 0.7 dB) */
		else if ( acelp_cfg->lsf_bits > 42 && L_frame == L_FRAME )
		{
		acelp_cfg->ubits = acelp_cfg->lsf_bits - 42;
		acelp_cfg->lsf_bits = 42;

lib_com/bitstream.c

+13 −7

Original line number	Diff line number	Diff line
		@@ -780,11 +780,19 @@ int16_t get_ivas_max_num_indices_metadata( /* o
		}
		else if ( ivas_total_brate <= IVAS_384k )
		{
		#ifdef FIX_509
		return 2000;
		#else
		return 1500;
		#endif
		}
		else
		{
		#ifdef FIX_509
		return 2500;
		#else
		return 2000;
		#endif
		}
		}
		else if ( ivas_format == MASA_FORMAT )
		@@ -2855,7 +2863,9 @@ ivas_error preview_indices(
		if ( bit_stream[2] == 0 )
		{
		st_ivas->ivas_format = SBA_FORMAT;
		#ifndef SBA_MODE_CLEAN_UP
		st_ivas->sba_mode = ivas_sba_mode_select();
		#endif
		}
		else
		{
		@@ -2893,9 +2903,6 @@ ivas_error preview_indices(
		break;
		case SID_ISM:
		st_ivas->ivas_format = ISM_FORMAT;
		/* temporary hack to make mode signaling work with the current 1-object ISM DTX: read padding bits */
		/* Todo: how to apply this here? maybe pt_stream += ... would work? */
		/* st->bit_stream += ( IVAS_SID_4k4 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; */
		break;
		case SID_MULTICHANNEL:
		st_ivas->ivas_format = MC_FORMAT;
		@@ -3060,7 +3067,7 @@ ivas_error read_indices(
		file_read_FECpattern( &st_ivas->bfi );
		st_ivas->bfi \|= bfi;

		if ( bfi == FRAMEMODE_MISSING ) /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */
		if ( bfi == FRAMEMODE_MISSING )
		{
		for ( k = 0; k < num_bits; k++ )
		{
		@@ -3226,7 +3233,7 @@ ivas_error read_indices(

		/* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */
		if ( (
		bfi != FRAMEMODE_FUTURE && /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */
		bfi != FRAMEMODE_FUTURE &&
		( CNG != 0 ) && ( ( speech_bad != 0 ) \|\| ( speech_lost != 0 ) ) ) \|\| / SP_BAD or SPEECH_LOST) --> stay in CNG */
		( sid_upd_bad != 0 ) ) /* SID_UPD_BAD --> start CNG */
		{
		@@ -3270,8 +3277,7 @@ ivas_error read_indices(
		}

		/* GOOD frame */
		if ( st_ivas->bfi == 0 \|\| st_ivas->bfi == FRAMEMODE_FUTURE /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */
		)
		if ( st_ivas->bfi == 0 \|\| st_ivas->bfi == FRAMEMODE_FUTURE )
		{
		/* GOOD frame - convert ITU-T G.192 words to short values */
		st_ivas->hDecoderConfig->ivas_total_brate = total_brate;