fix (cc82ba60) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_ism_com_fx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -472,13 +472,21 @@ void ivas_ism_reset_metadata(

		#ifdef OBJ_EDITING_API
		hIsmMeta->edited_gain_fx = ONE_IN_Q29;
		move32();
		hIsmMeta->edited_azimuth_fx = 0;
		move32();
		hIsmMeta->edited_elevation_fx = 0;
		move32();
		hIsmMeta->edited_pitch_fx = 0;
		move32();
		hIsmMeta->edited_yaw_fx = 0;
		move32();
		hIsmMeta->edited_radius_fx = ONE_IN_Q9;
		move32();
		hIsmMeta->gain_fx = ONE_IN_Q29;
		move32();
		hIsmMeta->non_diegetic_flag = 0;
		move16();
		#endif

		return;

lib_dec/ivas_init_dec_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2160,11 +2160,12 @@ ivas_error ivas_init_decoder_fx(
		}

		reset_indices_dec( st_ivas->hSCE[0]->hCoreCoder[0] );

		#ifndef OMASA_OBJECT_EDITING
		IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		#endif
		if ( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
		IF( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_omasa_dec_fx.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -316,7 +316,7 @@ ivas_error ivas_omasa_data_open_fx(
		{
		MASA_ISM_DATA_HANDLE hMasaIsmData;
		#ifdef OMASA_OBJECT_EDITING
		Word16 ch;
		Word16 ch, band_idx;
		#else
		Word16 ch, bin;
		#endif
		@@ -328,7 +328,7 @@ ivas_error ivas_omasa_data_open_fx(
		}

		#ifdef OMASA_OBJECT_EDITING
		FOR( Word16 band_idx = 0; band_idx < MASA_FREQUENCY_BANDS; band_idx++ )
		FOR( band_idx = 0; band_idx < MASA_FREQUENCY_BANDS; band_idx++ )
		{
		FOR( ch = 0; ch < 2; ch++ )
		{
		@@ -1205,6 +1205,7 @@ void ivas_omasa_dirac_rend_jbm_fx(
		FOR( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		Copy32( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );

		#ifdef OMASA_OBJECT_EDITING
		/* Gain discrete objects, if edited */
		IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
		@@ -1214,6 +1215,7 @@ void ivas_omasa_dirac_rend_jbm_fx(
		}
		#endif
		}

		#ifdef OMASA_OBJECT_EDITING
		/* Gain MASA part, if edited */
		IF( st_ivas->hMasaIsmData->masa_gain_is_edited )

lib_dec/ivas_osba_dec_fx.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -362,8 +362,6 @@ void ivas_osba_stereo_add_channels_fx(
		}
		}
		ELSE
		{
		FOR( n = 0; n < nchan_out; n++ )
		{
		FOR( n = 0; n < nchan_out; n++ )
		{
		@@ -374,10 +372,7 @@ void ivas_osba_stereo_add_channels_fx(
		}
		}
		}
		}
		ELSE
		{
		FOR( n = 0; n < nchan_out; n++ )
		{
		FOR( n = 0; n < nchan_out; n++ )
		{
		@@ -387,7 +382,6 @@ void ivas_osba_stereo_add_channels_fx(
		}
		}
		}
		}

		return;
		}

lib_dec/lib_dec_fx.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -1574,8 +1574,8 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
		{
		return error;
		}
		#endif

		#endif
		FOR( i = 0; i < MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS; i++ )
		{
		FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
		@@ -2447,11 +2447,9 @@ ivas_error IVAS_DEC_GetObjectMetadata(
		metadata->azimuth_fx = hIsmMeta->edited_azimuth_fx;
		metadata->elevation_fx = hIsmMeta->edited_elevation_fx;
		metadata->radius_fx = hIsmMeta->edited_radius_fx;

		metadata->yaw_fx = hIsmMeta->edited_yaw_fx;
		metadata->pitch_fx = hIsmMeta->edited_pitch_fx;
		metadata->spread_fx = 0;

		metadata->gainFactor_fx = hIsmMeta->edited_gain_fx;
		metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
		}
		@@ -4441,6 +4439,8 @@ ivas_error IVAS_DEC_GetEditableParameters(
		{
		hIvasEditableParameters->ism_metadata[obj].azimuth_fx = L_shl( L_deposit_l( st_ivas->hMasaIsmData->azimuth_ism_fx[obj][dirac_read_idx] ), Q22 );
		hIvasEditableParameters->ism_metadata[obj].elevation_fx = L_shl( L_deposit_l( st_ivas->hMasaIsmData->elevation_ism_fx[obj][dirac_read_idx] ), Q22 );
		move32();
		move32();

		hIvasEditableParameters->ism_metadata[obj].yaw_fx = st_ivas->hIsmMetaData[obj]->yaw_fx;
		hIvasEditableParameters->ism_metadata[obj].pitch_fx = st_ivas->hIsmMetaData[obj]->pitch_fx;
		@@ -4629,6 +4629,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
		/* copy relevant fields also to OMASA structs, but only if the value has been changed. original values are in st_ivas->hIsmMetaData */
		/* first, need to convert float values to ints used internally */
		Word16 new_azi, new_ele;

		new_azi = extract_l( L_shr( L_add( L_abs( hIvasEditableParameters.ism_metadata[obj].azimuth_fx ), 2097152 ), Q22 ) ); // Q22->Q0
		IF( LT_32( hIvasEditableParameters.ism_metadata[obj].azimuth_fx, 0 ) )
		{
		@@ -4652,6 +4653,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
		{
		dirac_read_idx = 0;
		}
		move16();

		/* determine thresholds for detecting object metadata edit for direction based on quantization resolution of the spatial direction parameters.
		* these depend from the number of bits used to transmit the directions,
		@@ -5074,7 +5076,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		/* check if we still need to prepare the renderer */
		IF( hIvasDec->hasBeenPreparedRendering == false )
		{

		IF( NE_32( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ), IVAS_ERR_OK ) )
		{
		return error;