make read/write operation exclusive (f4884b26) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/ivas_core_pre_proc_front.c

+19 −11

Original line number	Diff line number	Diff line
		@@ -460,12 +460,14 @@ ivas_error pre_proc_front_ivas(
		st->vad_flag = wb_vad( st, fr_bands, &i, &i, &i, &snr_sum_he, &localVAD_HE_SAD, &( st->flag_noisy_speech_snr ), NULL, NULL, -1000.0f, -1000.0f );

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, 1, "res/force_vad_flag.enf" );

		if ( st->force_dir[0] != '\0' )
		{
		dbgread( &st->vad_flag, sizeof( int16_t ), 1, fname( st->force_dir, "force_vad_flag.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, 1, "res/force_vad_flag.enf" );
		}
		#endif

		if ( force_front_vad == 1 \|\| front_vad_flag == 1 )
		@@ -516,12 +518,14 @@ ivas_error pre_proc_front_ivas(
		}

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &st->bwidth, sizeof( int16_t ), 1, 1, "res/force_bwidth.enf" );

		if ( st->force_dir[0] != '\0' )
		{
		dbgread( &st->bwidth, sizeof( int16_t ), 1, fname( st->force_dir, "force_bwidth.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &st->bwidth, sizeof( int16_t ), 1, 1, "res/force_bwidth.enf" );
		}
		#endif

		/----------------------------------------------------------------
		@@ -761,12 +765,14 @@ ivas_error pre_proc_front_ivas(
		smc_dec = ivas_smc_gmm( st, hStereoClassif, localVAD_HE_SAD, Etot, lsp_new, cor_map_sum, epsP, PS, non_staX, relE, &high_lpn_flag, flag_spitch );

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc1.enf" );

		if ( st->force_dir[0] != '\0' )
		{
		dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc1.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc1.enf" );
		}
		#endif

		#ifdef DEBUGGING
		@@ -878,11 +884,6 @@ ivas_error pre_proc_front_ivas(
		}

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc2.enf" );
		dbgwrite( &st->sp_aud_decision0, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision0.enf" );
		dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision1.enf" );
		dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision2.enf" );

		if ( st->force_dir[0] != '\0' )
		{
		dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc2.enf", -1, -1, -1 ) );
		@@ -890,6 +891,13 @@ ivas_error pre_proc_front_ivas(
		dbgread( &st->sp_aud_decision1, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision1.enf", -1, -1, -1 ) );
		dbgread( &st->sp_aud_decision2, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision2.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc2.enf" );
		dbgwrite( &st->sp_aud_decision0, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision0.enf" );
		dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision1.enf" );
		dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision2.enf" );
		}
		#endif

		/----------------------------------------------------------------

lib_enc/ivas_decision_matrix_enc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -212,12 +212,14 @@ void ivas_decision_matrix_enc(
		#endif

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core.enf" );

		if ( st->force_dir[0] != '\0' )
		{
		dbgread( &st->core, sizeof( int16_t ), 1, fname( st->force_dir, "force_core.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core.enf" );
		}
		#endif

		/* TCX not available at low bitrates -> replace it by GSC */

lib_enc/ivas_stereo_classifier.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -177,12 +177,14 @@ int16_t select_stereo_mode(
		}

		#ifdef DEBUG_FORCE_DIR
		dbgwrite( &element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );

		if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )
		{
		dbgread( &element_mode, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_element_mode.enf", -1, -1, -1 ) );
		}
		else
		{
		dbgwrite( &element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );
		}
		#endif

		/* switch from LRTD to DFT when xtalk_decision goes from 0->1 (note: this special case is not handled in the xtalk classifier) */

lib_enc/ivas_stereo_dft_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3299,7 +3299,7 @@ static float stereo_dft_calc_mean_ipd_change(
		ipd_mean_change /= gipd_band_max;

		#ifdef DEBUG_MODE_DFT
		dbgwrite( ipd_change, sizeof( float ), hStereoDft->gipd_band_max, 1, "res/stereo_dft_ipd_change.pcm" );
		//dbgwrite( ipd_change, sizeof( float ), hStereoDft->gipd_band_max, 1, "res/stereo_dft_ipd_change.pcm" );
		dbgwrite( &ipd_mean_change, sizeof( float ), 1, 1, "res/stereo_dft_ipd_mean_change.pcm" );
		#endif