commit 2 (70c0bb72) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_jbm_dec.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -3167,17 +3167,6 @@ ivas_error ivas_jbm_dec_render_fx(
		scale_sig32( st_ivas->hParamMC->h_freq_domain_decorr_ap_state->decorr_buffer_fx, st_ivas->hParamMC->h_freq_domain_decorr_ap_state->decorr_buffer_len, tmp );
		st_ivas->hParamMC->h_freq_domain_decorr_ap_state->q_decorr_buffer += tmp;
		}
		test();
		IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )
		{
		test();
		IF( st_ivas->hCombinedOrientationData && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
		{
		Word16 Q_hoa_encoder = 31;
		move16();
		floatToFixed_arrL( st_ivas->hParamMC->hoa_encoder, st_ivas->hParamMC->hoa_encoder_fx, Q_hoa_encoder, st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS );
		}
		}
		/* CLDFB synthesis */
		FOR( Word16 ch = 0; ch < nchan_out_cldfb; ch++ )
		{

lib_dec/ivas_mc_param_dec.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -214,9 +214,6 @@ ivas_error ivas_param_mc_dec_open_fx(
		mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );
		nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;
		hParamMC->hoa_encoder_fx = NULL;
		#if 1 /TODO: To be removed later(floating pointer initialization)/
		hParamMC->hoa_encoder = NULL;
		#endif

		/* determine the synthesis config */
		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD \|\| st_ivas->transport_config == output_config )
		@@ -491,12 +488,6 @@ ivas_error ivas_param_mc_dec_open_fx(
		/* Head or external rotation */
		if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		{
		#if 1 /TODO : To be removed later/
		IF( ( hParamMC->hoa_encoder = (float ) malloc( st_ivas->hTransSetup.nchan_out_woLFE MAX_INTERN_CHANNELS * sizeof( float ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
		}
		#endif
		IF( ( hParamMC->hoa_encoder_fx = (Word32 ) malloc( st_ivas->hTransSetup.nchan_out_woLFE MAX_INTERN_CHANNELS * sizeof( Word32 ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
		@@ -2246,13 +2237,6 @@ void ivas_param_mc_dec_close_fx(
		free( hParamMC->Cldfb_ImagBuffer_tc_fx );
		hParamMC->Cldfb_ImagBuffer_tc_fx = NULL;
		}
		#ifdef IVAS_FLOAT_FIXED_TO_BE_REMOVED /TODO: To be removed later(Floating point memory dealloc)------------------------------- /
		IF( hParamMC->hoa_encoder != NULL )
		{
		free( hParamMC->hoa_encoder );
		hParamMC->hoa_encoder = NULL;
		}
		#endif /*********************************ends here**********************************************/

		free( *hParamMC_out );
		*hParamMC_out = NULL;

lib_dec/ivas_mc_paramupmix_dec.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,6 @@ ivas_error ivas_mc_paramupmix_dec_open(
		}
		compute_hoa_encoder_mtx_fx( st_ivas->hTransSetup.ls_azimuth_fx, st_ivas->hTransSetup.ls_elevation_fx, hMCParamUpmix->hoa_encoder_fx, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER );
		// compute_hoa_encoder_mtx( st_ivas->hTransSetup.ls_azimuth, st_ivas->hTransSetup.ls_elevation, hMCParamUpmix->hoa_encoder, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER );
		Scale_sig32( hMCParamUpmix->hoa_encoder_fx, st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS, Q2 ); // Q29=>Q31
		}

		/* allocate transport channels*/

lib_dec/ivas_stat_dec.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -895,9 +895,9 @@ typedef struct ivas_param_mc_dec_data_structure
		HANDLE_DIRAC_DECORR_STATE h_freq_domain_decorr_ap_state;
		#ifdef IVAS_FLOAT_FIXED
		Word32 *hoa_encoder_fx;
		#endif // IVAS_FLOAT_FIXED

		#else
		float *hoa_encoder;
		#endif // IVAS_FLOAT_FIXED

		} PARAM_MC_DEC_DATA, *PARAM_MC_DEC_HANDLE;

lib_dec/lib_dec_fx.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -792,8 +792,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
		{
		fixedToFloat_arrL( hParamMC->diff_proto_info->proto_fac_fx[i], hParamMC->diff_proto_info->proto_fac[i], 26, hParamMC->diff_proto_info->num_source_chan_diff[i] );
		}
		IF( hParamMC->hoa_encoder_fx )
		fixedToFloat_arrL( hParamMC->hoa_encoder_fx, hParamMC->hoa_encoder, Q29, hIvasDec->st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS );
		}
		}
		#endif
		@@ -1218,8 +1216,6 @@ static ivas_error IVAS_DEC_Setup(
		fixedToFloat_arrL( hParamMC->diff_proto_info->proto_fac_fx[i], hParamMC->diff_proto_info->proto_fac[i], 26, hParamMC->diff_proto_info->num_source_chan_diff[i] );
		}
		}
		IF( hParamMC->hoa_encoder_fx )
		fixedToFloat_arrL( hParamMC->hoa_encoder_fx, hParamMC->hoa_encoder, Q29, st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS );
		}
		}

		@@ -1280,8 +1276,6 @@ static ivas_error IVAS_DEC_Setup(
		{
		fixedToFloat_arrL( st_ivas->hParamMC->diff_proto_info->proto_fac_fx[i], st_ivas->hParamMC->diff_proto_info->proto_fac[i], 26, st_ivas->hParamMC->diff_proto_info->num_source_chan_diff[i] );
		}
		IF( st_ivas->hParamMC->hoa_encoder_fx )
		fixedToFloat_arrL( st_ivas->hParamMC->hoa_encoder_fx, st_ivas->hParamMC->hoa_encoder, Q29, st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS );
		}
		}
		}