Commit c1595ad3 authored Apr 23, 2025 by Lauros Pajunen

Edit test cases, check also for combined orientation handle when checking orientation input

parent 9b6129e1

lib_dec/ivas_binRenderer_internal.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1028,7 +1028,11 @@ ivas_error ivas_binRenderer_open(
		ivas_dirac_dec_get_response( (int16_t) ls_azimuth_CICP19[k], (int16_t) ls_elevation_CICP19[k], hBinRenderer->hReverb->foa_enc[k], 1 );
		}
		}
		#ifdef IVAS_RTPDUMP
		else if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) )
		#else
		else if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		#endif
		{
		if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
		{

lib_dec/ivas_dirac_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1999,7 +1999,11 @@ void ivas_dirac_dec_render_sf(
		{
		mvs2s( &hSpatParamRendCom->azimuth[md_idx][hDirAC->hConfig->enc_param_start_band], &azimuth[hDirAC->hConfig->enc_param_start_band], hSpatParamRendCom->num_freq_bands - hDirAC->hConfig->enc_param_start_band );
		mvs2s( &hSpatParamRendCom->elevation[md_idx][hDirAC->hConfig->enc_param_start_band], &elevation[hDirAC->hConfig->enc_param_start_band], hSpatParamRendCom->num_freq_bands - hDirAC->hConfig->enc_param_start_band );
		#ifdef IVAS_RTPDUMP
		if ( ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) && st_ivas->hCombinedOrientationData->shd_rot_max_order == 0 )
		#else
		if ( ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && st_ivas->hCombinedOrientationData->shd_rot_max_order == 0 )
		#endif
		{
		num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band];
		rotateAziEle_DirAC( azimuth, elevation, num_freq_bands, hSpatParamRendCom->num_freq_bands, p_Rmat );

lib_dec/ivas_init_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2153,7 +2153,11 @@ ivas_error ivas_init_decoder(
		}
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		#ifdef IVAS_RTPDUMP
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		#endif
		{
		if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
		{

lib_dec/ivas_mc_param_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -401,7 +401,11 @@ ivas_error ivas_param_mc_dec_open(
		ivas_param_mc_dec_compute_interpolator( 0, 0, DEFAULT_JBM_CLDFB_TIMESLOTS, hParamMC->h_output_synthesis_params.interpolator );

		/* Head or external rotation */
		#ifdef IVAS_RTPDUMP
		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 \|\| st_ivas->hCombinedOrientationData ) )
		#else
		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 ) )
		#endif
		{
		if ( ( hParamMC->hoa_encoder = (float ) malloc( st_ivas->hTransSetup.nchan_out_woLFE MAX_INTERN_CHANNELS * sizeof( float ) ) ) == NULL )
		{

lib_dec/ivas_mc_paramupmix_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -349,7 +349,11 @@ ivas_error ivas_mc_paramupmix_dec_open(
		}

		/* Head or external rotation */
		#ifdef IVAS_RTPDUMP
		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 \|\| st_ivas->hCombinedOrientationData ) )
		#else
		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 ) )
		#endif
		{
		if ( ( hMCParamUpmix->hoa_encoder = (float ) malloc( st_ivas->hTransSetup.nchan_out_woLFE MAX_INTERN_CHANNELS * sizeof( float ) ) ) == NULL )
		{