clang format + removal of debugging code (550696b2) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -757,12 +757,10 @@ int main(
		}

		frame++;
		#ifndef DEBUG_IND_LIST
		if ( !arg.quietModeEnabled )
		{
		fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
		}
		#endif

		#ifdef WMOPS
		update_mem();

+0 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,6 @@

		#define BASOP_NOGLOB /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */
		#define IND_LIST_DYN /* VA: Issue 18: Dynamic allocation of ind_list[] and ind_list_metadata[] based on # of transport channels */
		/#define DEBUG_IND_LIST/

		#ifndef IND_LIST_DYN
		#define BITSTREAM_INDICES_MEMORY /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */

+2 −14

Original line number	Diff line number	Diff line
		@@ -99,12 +99,11 @@ ivas_error evs_enc(
		int16_t pitch_orig[3]; /* original open-loop pitch values that might be altered in core_acelp_tcx20_switching() within MODE2 */
		#endif
		ivas_error error;
		#ifdef DEBUG_IND_LIST
		int16_t old_nb_ind;
		#endif

		error = IVAS_ERR_OK;

		push_wmops( "evs_enc" );

		/------------------------------------------------------------------
		* Initialization
		-----------------------------------------------------------------/
		@@ -383,10 +382,6 @@ ivas_error evs_enc(
		---------------------------------------------------------------------/
		push_wmops( "BWE_encoding" );

		#ifdef DEBUG_IND_LIST
		old_nb_ind = st->hBstr->nb_ind_tot;
		#endif

		if ( st->input_Fs >= 16000 && st->bwidth < SWB )
		{
		/* Common pre-processing for WB TBE and WB BWE */
		@@ -508,13 +503,6 @@ ivas_error evs_enc(
		st->codec_mode = MODE2;
		}

		#ifdef DEBUG_IND_LIST
		if ( st->hBstr->nb_ind_tot - old_nb_ind > 0 )
		{
		fprintf( stdout, "Total number of allocated indices (BWE): %d, bitrate: %d, #indices: %d\n", st->extl, st->extl_brate, st->hBstr->nb_ind_tot - old_nb_ind );
		}
		#endif

		#ifdef DEBUG_MODE_INFO
		dbgwrite( &st->codec_mode, sizeof( int16_t ), 1, input_frame, "res/codec" );
		dbgwrite( &st->core, sizeof( int16_t ), 1, input_frame, "res/core" );

+0 −26

Original line number	Diff line number	Diff line
		@@ -105,9 +105,6 @@ ivas_error ivas_core_enc(
		ivas_error error;
		#ifdef IND_LIST_DYN
		int16_t max_num_indices_BWE;
		#ifdef DEBUG_IND_LIST
		int16_t old_nb_ind;
		#endif
		#endif

		push_wmops( "ivas_core_enc" );
		@@ -322,10 +319,6 @@ ivas_error ivas_core_enc(
		{
		st = sts[n];

		#ifdef DEBUG_IND_LIST
		old_nb_ind = st->hBstr->nb_ind_tot;
		#endif

		/---------------------------------------------------------------------
		* Postprocessing for ACELP/HQ core switching
		---------------------------------------------------------------------/
		@@ -432,26 +425,7 @@ ivas_error ivas_core_enc(
		updt_enc_common( st );
		}

		#ifdef DEBUG_IND_LIST
		if ( sts[n]->hBstr->nb_ind_tot - old_nb_ind > 0 )
		{
		fprintf( stdout, "Total number of allocated indices (BWE): %d, bitrate: %d, #indices: %d\n", sts[n]->extl, sts[n]->extl_brate, sts[n]->hBstr->nb_ind_tot - old_nb_ind );
		}
		#endif
		}

		#ifdef IND_LIST_DYN
		#ifdef DEBUG_IND_LIST
		for ( n = 0; n < n_CoreChannels; n++ )
		{
		if ( sts[n]->hBstr->nb_ind_tot > 0 )
		{
		fprintf( stdout, "Total number of allocated indices (core): %d, bitrate: %d, #indices: %d\n", sts[n]->core, sts[n]->total_brate, sts[n]->hBstr->nb_ind_tot );
		}
		}
		#endif
		#endif


		#ifdef DEBUG_MODE_INFO
		for ( n = 0; n < n_CoreChannels; n++ )

+0 −25

Original line number	Diff line number	Diff line
		@@ -1272,31 +1272,6 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
		}
		}


		#ifdef DEBUG_IND_LIST
		int16_t total_nb_ind = 0;
		for ( i = 0; i < st_ivas->ivas_max_num_indices; i++ )
		{
		if ( st_ivas->ind_list[i].nb_bits > -1 )
		{
		total_nb_ind++;
		}
		}

		fprintf( stdout, "Total number of allocated indices (codec): IVAS format: %d, bitrate: %d, #indices: %d\n", hEncoderConfig->ivas_format, hEncoderConfig->ivas_total_brate, total_nb_ind );

		total_nb_ind = 0;
		for ( i = 0; i < st_ivas->ivas_max_num_indices_metadata; i++ )
		{
		if ( st_ivas->ind_list_metadata[i].nb_bits > -1 )
		{
		total_nb_ind++;
		}
		}

		fprintf( stdout, "Total number of allocated indices (metadata): IVAS format: %d, bitrate: %d, #indices: %d\n", hEncoderConfig->ivas_format, hEncoderConfig->ivas_total_brate, total_nb_ind );
		#endif

		/* write indices into bitstream buffer */
		write_indices_ivas( st_ivas, outputBitStream, numOutBits );