simplifications (e5471e45) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_init_dec.c

+19 −22

Original line number	Diff line number	Diff line
		@@ -2815,15 +2815,15 @@ void ivas_initialize_handles_dec(
		}

		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		if ( !st_ivas->restartNeeded )
		{
		#endif
		st_ivas->bit_stream = NULL;
		st_ivas->mem_hp20_out = NULL;
		st_ivas->hLimiter = NULL;
		#ifdef FIX_FMSW_DEC
		}
		#endif
		st_ivas->mem_hp20_out = NULL;
		st_ivas->hLimiter = NULL;

		/* ISM metadata handles */
		for ( i = 0; i < MAX_NUM_OBJECTS; i++ )
		@@ -2867,7 +2867,7 @@ void ivas_initialize_handles_dec(
		st_ivas->hSbaIsmData = NULL;

		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		if ( !st_ivas->restartNeeded )
		{
		#endif
		st_ivas->hHeadTrackData = NULL;
		@@ -2963,10 +2963,6 @@ void ivas_destroy_dec(
		}
		}

		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		{
		#endif
		/* HP20 filter handles */
		if ( st_ivas->mem_hp20_out != NULL )
		{
		@@ -2978,9 +2974,6 @@ void ivas_destroy_dec(
		free( st_ivas->mem_hp20_out );
		st_ivas->mem_hp20_out = NULL;
		}
		#ifdef FIX_FMSW_DEC
		}
		#endif

		/* ISM metadata handles */
		ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
		@@ -3056,7 +3049,7 @@ void ivas_destroy_dec(
		ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion );

		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		if ( !st_ivas->restartNeeded )
		{
		#endif
		/* Custom LS configuration handle */
		@@ -3105,7 +3098,10 @@ void ivas_destroy_dec(
		ivas_HRTF_statistics_binary_close( &st_ivas->hHrtfStatistics );

		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		/* Limiter struct */
		ivas_limiter_close( &( st_ivas->hLimiter ) );

		if ( !st_ivas->restartNeeded )
		{
		#endif
		/* Config. Renderer */
		@@ -3118,9 +3114,10 @@ void ivas_destroy_dec(
		st_ivas->pAcousticEnvironments = NULL;
		}

		#ifndef FIX_FMSW_DEC
		/* Limiter struct */
		ivas_limiter_close( &( st_ivas->hLimiter ) );

		#endif
		/* Decoder configuration structure */
		if ( st_ivas->hDecoderConfig != NULL )
		{
		@@ -3156,7 +3153,7 @@ void ivas_destroy_dec(

		/* main IVAS handle */
		#ifdef FIX_FMSW_DEC
		if ( st_ivas->restartNeeded == 0 )
		if ( !st_ivas->restartNeeded )
		{
		free( *st_ivas_out );
		*st_ivas_out = NULL;

lib_dec/lib_dec.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ void IVAS_DEC_Close(
		}

		#ifdef FIX_FMSW_DEC
		if ( ( phIvasDec )->st_ivas->restartNeeded == 0 && ( phIvasDec )->hVoIP )
		if ( !( phIvasDec )->st_ivas->restartNeeded && ( phIvasDec )->hVoIP )
		#else
		if ( ( *phIvasDec )->hVoIP )
		#endif
		@@ -371,19 +371,12 @@ void IVAS_DEC_Close(
		ivas_destroy_dec( &( *phIvasDec )->st_ivas );
		#else
		ivas_destroy_dec( ( *phIvasDec )->st_ivas );
		#ifdef FIX_FMSW_DEC
		if ( ( *phIvasDec )->st_ivas->restartNeeded == 0 )
		{
		#endif
		( *phIvasDec )->st_ivas = NULL;
		#ifdef FIX_FMSW_DEC
		}
		#endif
		#endif
		}

		#ifdef FIX_FMSW_DEC
		if ( ( phIvasDec )->st_ivas == NULL \|\| ( phIvasDec )->st_ivas->restartNeeded == 0 )
		if ( ( phIvasDec )->st_ivas == NULL \|\| !( phIvasDec )->st_ivas->restartNeeded )
		{
		#endif
		apa_exit( &( *phIvasDec )->hTimeScaler );

apps/decoder.c

+1 −1

File changed.

Contains only whitespace changes.